Rehydrate

Signed-off-by: Roman Tsisyk <[email protected]>

Author: rtsisyk

.gitignore

@@ -1,11 +1,10 @@
-bin/
-gen/
-build/
-.settings/
-
+*.iml
+.gradle
+/local.properties
+/.idea
 .DS_Store
-.classpath
-.cproject
-.project
+/build
+/captures
+.externalNativeBuild
+.cxx
 local.properties
-lint.xml

README.md

@@ -25,14 +25,14 @@ Organic Maps works from *Android SDK version 21 (Android 5)* and above
 First step is to clone [repository][linkRepo] or download it as an archive.
 
 When your are done you find two folders: *lib* and *sample-app-capitals*. First one is a library project that you should add to your project.
-You don't need any additional permissions in your AndroidManifest.xml to use API library, so you can write real code straight away, calling for different `OrganicMapsApi` methods (more details below).
+You don't need any additional permissions in your AndroidManifest.xml to use API library, so you can write real code straight away, calling for different `Api` methods (more details below).
 
 ## Classes Overview and HOW TO
 Core classes you will work with are:
 
-* [app.organicmaps.api.OrganicMapsApi][linkApiClass] - static class with methods such as `showPointOnMap(Activity, double, double, String)` etc.
-* [app.organicmaps.api.OMPoint][linkPointClass] - model of POI, includes lat, lon, name, id, and style data.
-* [app.organicmaps.api.OMResponse][linkRespClass] - helps you to extract response from Organic Maps by applying `OMResponse.extractFromIntent(Intent)` to Intent. Contains OMPoint data.
+* [app.organicmaps.api.Api][linkApiClass] - static class with methods such as `showPointOnMap(Activity, double, double, String)` etc.
+* [app.organicmaps.api.Point][linkPointClass] - model of POI, includes lat, lon, name, id, and style data.
+* [app.organicmaps.api.Response][linkRespClass] - helps you to extract response from Organic Maps by applying `Response.extractFromIntent(Intent)` to Intent. Contains Point data.
 
 ### Show Points on the Map
 
@@ -48,25 +48,25 @@ The simplest usage:
         final double lon = ...;
         final String name = ...;
         // Ask Organic Maps to show the point
-        OrganicMapsApi.showPointOnMap(this, lat, lon, name);
+        Api.showPointOnMap(this, lat, lon, name);
       }
     ...
 
     }
 
-For multiple points use [OMPoint][linkPointClass] class:
+For multiple points use [Point][linkPointClass] class:
 
     void showMultiplePoints(List<SomeDomainObject> list)
     {
-      // Convert objects to MMWPoints
-      final OMPoint[] points = new OMPoint[list.length];
+      // Convert objects to OM Points
+      final Point[] points = new Point[list.length];
       for (int i = 0; i < list.size; i++)
       {
-        // Get lat, lon, and name from object and assign it to new MMWPoint
-        points[i] = new OMPoint(lat, lon, name);
+        // Get lat, lon, and name from object and assign it to new Point
+        points[i] = new Point(lat, lon, name);
       }
       // Show all point on the map, you could also provide some title
-      OrganicMapsApi.showPointsOnMap(this, "Look at my points, my points are amazing!", points);
+      Api.showPointsOnMap(this, "Look at my points, my points are amazing!", points);
     }
 
 
@@ -80,18 +80,18 @@ your application when user press "More Info" button :
     // Here is how to pass points with ID ant PendingIntent
     void showMultiplePointsWithPendingIntent(List<SomeDomainObject> list, PendingIntent pendingIntent)
     {
-      // Convert objects to OMPoints
-      final OMPoint[] points = new OMPoint[list.length];
+      // Convert objects to Points
+      final Point[] points = new Point[list.length];
       for (int i = 0; i < list.size; i++)
       {
         //                                      ||
         //                                      ||
         //                                      \/
         //         Now you should specify string ID for each point
-        points[i] = new OMPoint(lat, lon, name, id);
+        points[i] = new Point(lat, lon, name, id);
       }
       // Show all points on the map, you could also provide some title
-      OrganicMapsApi.showPointsOnMap(this, "This title says that user should choose some point", pendingIntent, points);
+      Api.showPointsOnMap(this, "This title says that user should choose some point", pendingIntent, points);
     }
 
     //Code below shows general way to extract response data
@@ -100,7 +100,7 @@ your application when user press "More Info" button :
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
         // Handle intent you specified with PandingIntent
-        // Now it has additional information (OMPoint).
+        // Now it has additional information (Point).
         handleIntent(getIntent());
     }
 
@@ -114,35 +114,37 @@ your application when user press "More Info" button :
 
     void handleIntent(Intent intent)
     {
-      // Apply OMResponse extraction method to intent
-      final OMResponse mwmResponse = OMResponse.extractFromIntent(this, intent);
+      // Apply Response extraction method to intent
+      final Response mwmResponse = Response.extractFromIntent(this, intent);
       // Here is your point that user selected
-      final OMPoint point = mwmResponse.getPoint();
+      final Point point = mwmResponse.getPoint();
       // Now, for instance you can do some work depending on point id
       processUserInteraction(point.getId());
     }
 
 ## FAQ
 
 #### How should I detect if user has Organic Maps installed?
-`OrganicMapsApi.isOrganicMapsInstalled(Context)` will return `true` if user has *Lite* or *Pro* version that supports API call installed.
+`Api.isOrganicMapsInstalled(Context)` will return `true` if user has *Lite* or *Pro* version that supports API call installed.
 
 #### Which versions of Organic Maps support API calls?
 All versions since 2.4.0 and above support API calls.
 
-#### What will happen if I call for `OrganicMapsApi.showPoint()` but Organic Maps application is not installed?
+#### What will happen if I call for `Api.showPoint()` but Organic Maps application is not installed?
 Nothing serious. API library will show simple dialog with gentle offer to download Organic Maps. You can see how it looks like below.
 
 ![Please install us](site/images/dlg.png)
 
 ## Sample Code and Application
 
-* [Sample Application at Google Play][linkSampleGooglePlay]
 * [Sample Application Source Code][linkSampleSource]
 
 -------------------------------------------------------------------------------
 ## API Code License
+
+Copyright (c) 2022, Organic Maps OÜ.
 Copyright (c) 2019, MY.COM B.V.
+Copyright (c) 2013, MapsWithMe GmbH.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
@@ -154,12 +156,10 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 
 [linkOM]: https://organicmaps.app/ "Organic Maps"
 [linkPIntent]: http://developer.android.com/reference/android/app/PendingIntent.html "PendingIntent"
-[linkRepo]: https://github.com/mapswithme/api-android "GitHub Repository"
+[linkRepo]: https://github.com/organicmaps/api-android "GitHub Repository"
 [linkLibProj]: http://developer.android.com/tools/projects/index.html#LibraryProjects "Android Library Project"
 [linkIntents]: http://developer.android.com/guide/components/intents-filters.html "Intents and Intent Filters"
-[linkApiClass]: lib/src/com/mapswithme/maps/api/OrganicMapsApi.java "OrganicMapsApi.java"
-[linkPointClass]: lib/src/com/mapswithme/maps/api/OMPoint.java "OMPoint.java"
-[linkRespClass]: lib/src/com/mapswithme/maps/api/OMResponse.java  "OMResponse.java"
-[linkSampleSource]: https://github.com/mapswithme/api-android/tree/master/sample-app-capitals "Api Source Code"
-[linkSampleGooglePlay]: http://play.google.com/store/apps/details?id=com.mapswithme.capitals "Api Demo .apk"
-[linkTravelGuides]: http://www.guidewithme.com
+[linkApiClass]: lib/src/app/organicmaps/api/Api.java "Api.java"
+[linkPointClass]: lib/src/app/organicmaps/api/Point.java "Point.java"
+[linkRespClass]: lib/src/app/organicmaps/api/Response.java  "Response.java"
+[linkSampleSource]: https://github.com/organicmaps/api-android/tree/master/sample-app-capitals "Api Source Code"

build.gradle

@@ -0,0 +1,9 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+plugins {
+  id 'com.android.application' version '7.2.1' apply false
+  id 'com.android.library' version '7.2.1' apply false
+}
+
+task clean(type: Delete) {
+  delete rootProject.buildDir
+}

gradle.properties

@@ -0,0 +1,21 @@
+# Project-wide Gradle settings.
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app"s APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
+android.useAndroidX=true
+# Enables namespacing of each library's R class so that its R class includes only the
+# resources declared in the library itself and none from the library's dependencies,
+# thereby reducing the size of the R class for that library
+android.nonTransitiveRClass=true

gradle/wrapper/gradle-wrapper.jar

@@ -0,0 +1,6 @@
+#Mon Jun 06 09:48:49 TRT 2022
+distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionPath=wrapper/dists
+zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,185 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"