abakedapplepie · PickleRickVE · Sep 11, 2019 · Sep 11, 2019 · Sep 11, 2019 · Sep 11, 2019
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -0,0 +1,32 @@
+name: Docker
+on: [push]
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+jobs:
+  Docker:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Log in to the Container registry
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+/config/*
+/tools_config/*
+.DS_Store
diff --git a/.htaccess.example b/.htaccess.example
@@ -0,0 +1,5 @@
+Options -Indexes
+AuthType Basic
+AuthName "Restricted content"
+AuthUserFile /var/www/html/config/.htpasswd
+Require valid-user
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,19 @@
+FROM php:7.2.2-apache
+
+# Remove folders from the html-folder (in case of an update)
+WORKDIR /var/www/html/
+RUN rm -rf /var/www/html/*
+
+# Copy all files over to the working directory
+COPY ./css/* /var/www/html/css/
+COPY ./other/* /var/www/html/other/
+COPY ./index.php /var/www/html/
+
+# Copy config-files over to the working directory
+# Uncomment the lines if you have set up a password
+COPY ./config/config.env.php /var/www/html/config/config.php
+#COPY ./config/.htpasswd /var/www/html/config/.htpasswd
+#COPY ./.htaccess.example /var/www/html/.htaccess
+
+# Run the application
+RUN docker-php-ext-install pdo pdo_mysql
diff --git a/README.md b/README.md
@@ -1,101 +1,34 @@
-![RealDeviceMap-tools](assets/map-header.png?raw=true)
 # RealDeviceMap-tools
 Tools for managing RealDeviceMap data
+![RealDeviceMap-tools](assets/map-header.png?raw=true)
 
-## rdm-tools.php
-### Changes
-* Now you can report on all nests at once!
-* You don't have to have spawns/stops visible on map to perform reporting anymore.
-* Revised optimization function - same super simple algorithm, might be better performing though
-* Changes to data storage, functions no longer loop through map objects, coordinates for gyms/stops/spawns are stored separately. Should help with performance
-
-### Features
-* View/hide known gyms, stops, and spawnpoints
-* Optionally show only unknown gyms/stops
-* Nest polygon import from OSM data, set to last datetime of Niantic OSM sync
-  * [date:"2018-04-09T01:32:00Z"]
-  * way["leisure"="park"]
-  * way["leisure"="recreation_ground"]
-  * way["landuse"="recreation_ground"]
-* CSV and GeoJSON polygon import
-* GeoJSON polygon export
-* Coordinate generation - blanket fill polygons with route points
-* Coordinate optimization - fill polygons with route points optimized for existing known gyms/stops/spawnpoints
-* Instance import - view your RDM instances and add/remove route points, then reexport and upload to RDM
-
-### Installation
-Simply upload rdm-tools.php to your favorite webserver, point the database variables to your RDM DB's IP, and configure your username/password.
-
-### Usage
-The map has a variety of control buttons for performing different functions: 
-
-#### ![Map Settings](assets/map-settings.png?raw=true) Settings
-* Nest Migration Date - select the last nest migration.
-* Optimization Attempts - number of passes to attempt to optimize coordinates during optimization.
-* Circle Size - View distance radius (in meters) to route for.
-* Generate all nests - Get a report of spawns for all nests in current map bounds. _See below_.
-
-#### Map mode
-* ![Map Mode - Routing](assets/map-routing.png?raw=true) Enables full functionality including polygon and routing functions.
-* ![Map Mode - Viewing](assets/map-viewing.png?raw=true) For viewing points of interest and spawnpoints only. Enables the option to filter unknown points of interest.
-
-#### View mode
-* ![View Mode - Gyms](assets/map-view-gyms.png?raw=true) Enables/disables viewing gyms as red dots on the map.
-* ![View Mode - Pokestops](assets/map-view-stops.png?raw=true) Enables/disables viewing pokestops as green dots on the map.
-* ![View Mode - Spawnpoints](assets/map-view-spawns.png?raw=true) Enables/disables viewing spawnpoints as blue dots on the map.
-
-#### Routing and Drawing
-* ![Draw Polygon](assets/map-draw-polygon.png?raw=true) Enables drawing of polygons on the map.
-* ![Manual route placement](assets/map-place-circle.png?raw=true) Enables/disables manual placement of route points. Click on the map to drop a route point in the routing layer based on view radius setting.
-* ![Import Nests](assets/map-import-nests.png?raw=true) Pulls nest data from OSM and places polygons in the current map bounds covering all parks.
-* ![Import Polygon](assets/map-import-polygon.png?raw=true) Import CSV or GeoJSON polygon data. GeoJSON can contain multiple polygons, each one will be placed individually.
-* ![Import Instance](assets/map-import-instance.png?raw=true) Imports an instance from your RDM DB and places the route points in the routing layer based on view radius setting.
-* ![Clear Routing Layer](assets/map-clear-routing-layer.png?raw=true) Clears the current route from the map, leaving polygons behind
-* ![Clear All Layers](assets/map-clear-all-layers.png?raw=true) Clears all route points and polygons from map.
-* ![Generate Route](assets/map-generate-route.png?raw=true) Generates a blanket route over all polygons on the map.
-* ![Optimize Route](assets/map-optimize-route.png?raw=true) Takes all visible points - gyms, stops, and spawns - and optimizes a route between them based on view radius (circle size).
-* ![Get Output](assets/map-get-output.png?raw=true) Opens a textbox to generate lat,lon points for all routing layer coordinates, to be saved as an instance in RDM.
-
-#### Polygon options
-![Polygon Options](assets/polygon-options.png?raw=true)
-
-Clicking on any polygon will allow you to generate a spawn report, remove it from the map, or export as GeoJSON.
-
-To generate a spawn report, keep in mind the Nest Migration Date setting. The query generated for your database will only grab spawn data from that point forward. If you are just looking to get data for your area and not specifically reporting on a nest, set the date accordingly before generating your report. Once generated, a modal window will open showing a table of all the spawn counts for that polygon.
-
-![Example spawn report](assets/example-spawn-report.png?raw=true)
-
-Example spawn report for a local nest.
-
-#### New feature - generate a spawn report for all nests
-In the settings menu, a new button is available to create a report for all nests in your current map bounds. Make sure you import nest polygons first!
-
-![Example spawn report](assets/example-all-nests-report.png?raw=true)
-
-Example multi-nest report
-
-#### Route options
-![Route Options](assets/route-point-options.png?raw=true)
-
-After a route is generated, you can click on any point of the route to remove it from the map.
-
-## Example outputs
-![Example spawn route](assets/example-blanket-route-spawn.png?raw=true)
-
-Example route showing a blanket route of 75m circles covering a town for finding new spawn points.
-
-![Example gym route](assets/example-blanket-route-gym.png?raw=true)
-
-Example route showing the same polygon covered with 500m circles for finding new raids and stops.
-
-![Example optimized gym route](assets/example-optimized-route-gyms.png?raw=true)
-
-Example optimization covering gyms in a polygon
-
-![Example nest route](assets/example-blanket-route-nest.png?raw=true)
-
-Example optimization covering all nests in map bounds, for finding new spawnpoints in nests
-
-![Example optimized nest route](assets/example-optimized-route-nests.png?raw=true)
-
-Example optimization covering known spawnpoints in multiple nests. Note that you can remove overlapping circles by clicking on them and choosing delete - the optimization routine still needs some work.
+## Changes
+* Added more details to the import of administrative boundaries
+* Distance between points on routes is colored
+* Option to show routes for instances, generate new routes for instances or drawn circles and visualize it directly
+* Added Dockerfile to generate a local image
+* Autogeneration of the correct circle size for raid instances depending on the specific latitude, option in settings to choose between iv-, raid- or own radius
+* Color Picker built in for instance- and polygon-import
+
+## Installation
+1. `git clone https://github.com/PickleRickVE/RealDeviceMap-tools`
+2. Enter the new folder `cd RealDeviceMap-tools` and go to the config folder `cd config`
+2. Edit `nano config.env.php` and add your credentials for the RDM and/or Nest database.
+3. Edit `nano .htpasswd` to set a username and password. The default user is **admin** with password **admin**, you can generate one [here](https://www.web2generators.com/apache-tools/htpasswd-generator).
+
+### Optional: when running Docker
+1. Paste the contents from docker-compose.example.yml in the files where RDM & it's database is located and edit where needed
+2. Check Dockerfile and uncomment the line with .htaccess if you want to use a password
+3. Run `docker-compose up -d --build rdm_tools`
+
+## Updates
+1. Use git pull in the folder
+2. When using Docker, re-run `docker-compose up -d --build rdm_tools`
+
+## Usage
+For more info please use the [wiki](https://github.com/PickleRickVE/RealDeviceMap-tools/wiki).
+
+## Thanks
+* Credit to [abakedapplepie](https://github.com/abakedapplepie) and his creditors for the base
+* Credit to [lovasoa](https://github.com/lovasoa) for the traveling salesman script
+* Credit to [leevo](https://github.com/xxleevo) for various ideas 
diff --git a/assets/README.md b/assets/README.md
diff --git a/assets/example-all-nests-report.png b/assets/example-all-nests-report.png
diff --git a/assets/example-blanket-route-gym.png b/assets/example-blanket-route-gym.png
diff --git a/assets/example-blanket-route-nest.png b/assets/example-blanket-route-nest.png
diff --git a/assets/example-blanket-route-spawn.png b/assets/example-blanket-route-spawn.png
diff --git a/assets/example-optimized-route-gyms.png b/assets/example-optimized-route-gyms.png
diff --git a/assets/example-optimized-route-nests.png b/assets/example-optimized-route-nests.png
diff --git a/assets/example-spawn-report.png b/assets/example-spawn-report.png
diff --git a/assets/map-clear-all-layers.png b/assets/map-clear-all-layers.png
diff --git a/assets/map-clear-routing-layer.png b/assets/map-clear-routing-layer.png
diff --git a/assets/map-draw-polygon.png b/assets/map-draw-polygon.png
diff --git a/assets/map-generate-route.png b/assets/map-generate-route.png
diff --git a/assets/map-get-output.png b/assets/map-get-output.png
diff --git a/assets/map-header.png b/assets/map-header.png
diff --git a/assets/map-import-instance.png b/assets/map-import-instance.png
diff --git a/assets/map-import-nests.png b/assets/map-import-nests.png
diff --git a/assets/map-import-polygon.png b/assets/map-import-polygon.png
diff --git a/assets/map-optimize-route.png b/assets/map-optimize-route.png
diff --git a/assets/map-place-circle.png b/assets/map-place-circle.png
diff --git a/assets/map-routing.png b/assets/map-routing.png
diff --git a/assets/map-settings.png b/assets/map-settings.png
diff --git a/assets/map-view-gyms.png b/assets/map-view-gyms.png
diff --git a/assets/map-view-spawns.png b/assets/map-view-spawns.png
diff --git a/assets/map-view-stops.png b/assets/map-view-stops.png
diff --git a/assets/map-viewing.png b/assets/map-viewing.png
diff --git a/assets/polygon-options.png b/assets/polygon-options.png
diff --git a/assets/route-point-options.png b/assets/route-point-options.png
diff --git a/assets/settings-button.png b/assets/settings-button.png
diff --git a/assets/settings.png b/assets/settings.png
diff --git a/config/.htpasswd b/config/.htpasswd
@@ -0,0 +1 @@
+admin:$apr1$1edgsm5o$xGC./.P3PARUp1x56wEIx/
diff --git a/config/config.env.php b/config/config.env.php
@@ -0,0 +1,21 @@
+<?php
+
+// RDM DB
+define('DB_HOST', getenv("DB_HOST") ?: "127.0.0.1");
+define('DB_USER', getenv("DB_USER") ?: "rdmuser");
+define('DB_PSWD', getenv("DB_PSWD") ?: "password");
+define('DB_NAME', getenv("DB_NAME") ?: "rdmdb");
+define('DB_PORT', getenv("DB_PORT") ?: 3306);
+
+// ManualDB (for nests)
+define('MDB_ACTIVE', getenv("MDB_ACTIVE") ?: false);
+define('MDB_HOST', getenv("MDB_HOST") ?: "127.0.0.1");
+define('MDB_USER', getenv("MDB_HOST") ?: "mdbuser");
+define('MDB_PSWD', getenv("MDB_HOST") ?: "password");
+define('MDB_NAME', getenv("MDB_HOST") ?: "manualdb");
+define('MDB_PORT', getenv("MDB_HOST") ?: 3306);
+
+// own Tileserver
+define('OWN_TS', getenv("OWN_TS") ?: "https://IP:PORT/tile/STYLE/{z}/{x}/{y}/1/png");
+
+?>
diff --git a/css/leaflet-search.css b/css/leaflet-search.css
@@ -0,0 +1,134 @@
+/* 
+ * Leaflet Control Search v2.9.7 - 2019-01-14 
+ * 
+ * Copyright 2019 Stefano Cudini 
+ * stefano.cudini@gmail.com 
+ * http://labs.easyblog.it/ 
+ * 
+ * Licensed under the MIT license. 
+ * 
+ * Demo: 
+ * http://labs.easyblog.it/maps/leaflet-search/ 
+ * 
+ * Source: 
+ * git@github.com:stefanocudini/leaflet-search.git 
+ * 
+ */
+
+.leaflet-container .leaflet-control-search {
+	position:relative;
+	float:left;
+	background:#fff;
+	color:#1978cf;
+	border: 2px solid rgba(0,0,0,0.2);
+	background-clip: padding-box;
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+	border-radius: 4px;
+	background-color: rgba(255, 255, 255, 0.8);
+	z-index:1000;	
+	margin-left: 10px;
+	margin-top: 10px;
+}
+.leaflet-control-search.search-exp {/*expanded*/
+	background: #fff;
+	border: 2px solid rgba(0,0,0,0.2);
+	background-clip: padding-box;	
+}
+.leaflet-control-search .search-input {
+	display:block;
+	float:left;
+	background: #fff;
+	border:1px solid #666;
+	border-radius:2px;
+	height:22px;
+	padding:0 20px 0 2px;
+	margin:4px 0 4px 4px;
+}
+.leaflet-control-search.search-load .search-input {
+	background: url('../other/loader.gif') no-repeat center right #fff;
+}
+.leaflet-control-search.search-load .search-cancel {
+	visibility:hidden;
+}
+.leaflet-control-search .search-cancel {
+	display:block;
+	width:22px;
+	height:22px;
+	position:absolute;
+	right:28px;
+	margin:6px 0;
+	background: url('../other/search-icon.png') no-repeat 0 -46px;
+	text-decoration:none;
+	filter: alpha(opacity=80);
+	opacity: 0.8;		
+}
+.leaflet-control-search .search-cancel:hover {
+	filter: alpha(opacity=100);
+	opacity: 1;
+}
+.leaflet-control-search .search-cancel span {
+	display:none;/* comment for cancel button imageless */
+	font-size:18px;
+	line-height:20px;
+	color:#ccc;
+	font-weight:bold;
+}
+.leaflet-control-search .search-cancel:hover span {
+	color:#aaa;
+}
+.leaflet-control-search .search-button {
+	display:block;
+	float:left;
+	width:30px;
+	height:30px;	
+	background: url('../other/search-icon.png') no-repeat 4px 4px #fff;
+	border-radius:4px;
+}
+.leaflet-control-search .search-button:hover {
+	background: url('../other/search-icon.png') no-repeat 4px -20px #fafafa;
+}
+.leaflet-control-search .search-tooltip {
+	position:absolute;
+	top:100%;
+	left:0;
+	float:left;
+	list-style: none;
+	padding-left: 0;
+	min-width:120px;
+	max-height:122px;
+	box-shadow: 1px 1px 6px rgba(0,0,0,0.4);
+	background-color: rgba(0, 0, 0, 0.25);
+	z-index:1010;
+	overflow-y:auto;
+	overflow-x:hidden;
+	cursor: pointer;
+}
+.leaflet-control-search .search-tip {
+	margin:2px;
+	padding:2px 4px;
+	display:block;
+	color:black;
+	background: #eee;
+	border-radius:.25em;
+	text-decoration:none;	
+	white-space:nowrap;
+	vertical-align:center;
+}
+.leaflet-control-search .search-button:hover {
+	background-color: #f4f4f4;
+}
+.leaflet-control-search .search-tip-select,
+.leaflet-control-search .search-tip:hover {
+	background-color: #fff;
+}
+.leaflet-control-search .search-alert {
+	cursor:pointer;
+	clear:both;
+	font-size:.75em;
+	margin-bottom:5px;
+	padding:0 .25em;
+	color:#e00;
+	font-weight:bold;
+	border-radius:.25em;
+}