5.0.0

aqoleg · Mar 1, 2023 · be5bb5d · be5bb5d
1 parent 91c43e7
commit be5bb5d
Show file tree

Hide file tree

Showing 76 changed files with 4,383 additions and 2,491 deletions.
diff --git a/README.md b/README.md
@@ -1,14 +1,63 @@
 # cat
 
-All maps offline in one app and track writer.
+All maps offline with a track writer.
+
+[download](https://github.com/aqoleg/cat/releases/download/5.0.0/cat.apk)
+
+## add maps
+
+[mende](https://cat.aqoleg.com/app?newMap=mende&newUrl=http%3A%2F%2Fcat.aqoleg.com%2Fmaps%2Fmende%2F%253%24d%2F%252%24d%2F%251%24d.jpeg)
+
+[osm](https://cat.aqoleg.com/app?newMap=osm&newUrl=http%3A%2F%2Fa.tile.openstreetmap.org%2F%253%24d%2F%251%24d%2F%252%24d.png)
+
+[otm](https://cat.aqoleg.com/app?newMap=otm&newUrl=https%3A%2F%2Fa.tile.opentopomap.org%2F%253%24d%2F%251%24d%2F%252%24d.png)
+
+[topo](https://cat.aqoleg.com/app?newMap=topo&newUrl=https%3A%2F%2Fmaps.marshruty.ru%2Fml.ashx%3Fal%3D1%26x%3D%251%24d%26y%3D%252%24d%26z%3D%253%24d)
+
+[gsat](https://cat.aqoleg.com/app?newMap=gsat&newUrl=https%3A%2F%2Fkhms0.googleapis.com%2Fkh%3Fv%3D937%26hl%3Den%26x%3D%251%24d%26y%3D%252%24d%26z%3D%253%24d)
+
+[gmap](https://cat.aqoleg.com/app?newMap=gmap&newUrl=http%3A%2F%2Fmt0.google.com%2Fvt%2Flyrs%3Dm%26hl%3Den%26x%3D%251%24d%26y%3D%252%24d%26z%3D%253%24d)
+
+[yasat (ellipsoid)](https://cat.aqoleg.com/app?newMap=yasat&newUrl=https%3A%2F%2Fsat01.maps.yandex.net%2Ftiles%3Fl%3Dsat%26x%3D%251%24d%26y%3D%252%24d%26z%3D%253%24d%26g%3DGagarin&newProjection=ellipsoid)
+
+[arcsat](https://cat.aqoleg.com/app?newMap=arcsat&newUrl=https%3A%2F%2Fservices.arcgisonline.com%2FArcGIS%2Frest%2Fservices%2FWorld_Imagery%2FMapServer%2Ftile%2F%253%24d%2F%252%24d%2F%251%24d)
+
+[arctopo](https://cat.aqoleg.com/app?newMap=arctopo&newUrl=https%3A%2F%2Fservices.arcgisonline.com%2FArcGIS%2Frest%2Fservices%2FWorld_Topo_Map%2FMapServer%2Ftile%2F%253%24d%2F%252%24d%2F%251%24d)
+
+## external api
+
+http(s)://cat.aqoleg.com/app?
+
+### add map
+
+newMap=mapName&newUrl=urlToDownload&newProjection=projection&
+
+where
+
+- newMap - the name of the map to add
+- newUrl - url to download tiles, with %1$d for x, %2$d for y an %3$d for z, for example https://tileserver.com/x=%1$d/y=%2$d/z=%3$d.png
+- newProjection - optional, use 'ellipsoid' for ellipsoid prjection
+
+### open map
+
+map=mapName&
+
+### setZoom
+
+z=zoom&
+
+### open point
+
+longitude=lon&latitude=lat&  or
+lon=lon&lat=lat&
+
+### open track
+
+track=track&
+
+where track is decoded track "xLonyLatxNextLonyNextLat", for example
+track=x-34y-51x-34.5y-51.5x-34.1y-51.2
 
-[download](https://github.com/aqoleg/cat/releases/download/4.0.1/cat.apk)
 
-Put tiles in the /cat/maps/mapName/z/y/x.png or /x.jpeg 
-and/or specifiy parameters in /cat/maps/mapName/properties.txt as json file:
-- "name" - optional, name of the map
-- "url" - optional, url to download as java formatted string "https://example/x=%1$d/y=%2$d/z=%3$d"
-- "size" - optional, size of the tile
-- "projection": "ellipsoid" - optional, for ellipsoid projection
 
 [deprecated store](https://play.google.com/store/apps/details?id=space.aqoleg.cat)
diff --git a/src/app/build.gradle → src/android/build.gradle b/src/app/build.gradle → src/android/build.gradle
@@ -4,11 +4,11 @@ android {
     compileSdkVersion 26
     buildToolsVersion "27.0.1"
     defaultConfig {
-        applicationId "space.aqoleg.cat"
+        applicationId 'com.aqoleg.cat'
         minSdkVersion 11
         targetSdkVersion 26
-        versionCode 47
-        versionName "4.0.1"
+        versionCode 48
+        versionName '5.0.0'
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -18,6 +18,8 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    productFlavors {
+    }
 }
 
 dependencies {
@@ -26,4 +28,4 @@ dependencies {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     testCompile 'junit:junit:4.12'
-}
+}
diff --git a/src/app/src/main/AndroidManifest.xml → src/android/src/main/AndroidManifest.xml b/src/app/src/main/AndroidManifest.xml → src/android/src/main/AndroidManifest.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="space.aqoleg.cat">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.aqoleg.cat">
     <uses-feature android:name="android.hardware.location.gps" />
     <uses-feature android:name="android.hardware.location.network" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.INTERNET" />
-    <application android:label="@string/label" android:icon="@mipmap/icon" android:description="@string/description"
+    <application android:label="@string/cat" android:icon="@mipmap/icon" android:description="@string/description"
         android:allowBackup="false">
-        <activity android:name=".MainActivity" android:launchMode="singleTask"
+        <activity android:name=".ActivityMain" android:launchMode="singleTask"
             android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -18,9 +19,27 @@
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="https" />
+                <data android:scheme="http" />
+                <data android:host="cat.aqoleg.com" />
+                <data android:path="/app" />
+                <data android:path="/app/" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
                 <data android:scheme="geo" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:scheme="file" />
+                <data android:host="*" />
+                <data android:mimeType="*/*" />
+                <data android:pathPattern=".*\\.gpx" />
+                <data android:pathPattern=".*\\..*\\.gpx" />
+            </intent-filter>
         </activity>
-        <service android:name=".MainService" android:description="@string/serviceDescription" />
+        <service android:name=".ServiceMain" android:description="@string/serviceDescription" />
     </application>
 </manifest>