-
Notifications
You must be signed in to change notification settings - Fork 36
Bringing the tools up2date and adding some new functions #23
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
PickleRickVE
wants to merge
147
commits into
abakedapplepie:master
Choose a base branch
from
PickleRickVE:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 8 commits
Commits
Show all changes
147 commits
Select commit
Hold shift + click to select a range
144a820
Add files via upload
PickleRickVE e20d31c
Add files via upload
PickleRickVE 457e5b4
Add files via upload
PickleRickVE 70a2052
Update README.md
PickleRickVE fd88de0
Add files via upload
PickleRickVE e30390c
Update README.md
PickleRickVE 50690e9
show ex-raid-eligible gyms as maroon
PickleRickVE 86e2de7
show names of stops & gyms on popup
PickleRickVE 6090a34
Update README.md
PickleRickVE 1c7fcb1
Update rdm-tools.php
PickleRickVE 56ae14e
changed view of despawn_sec
PickleRickVE 816040d
changed rdmdb.pokemon to pokemon
PickleRickVE e823f8d
added spawnpoints to unknown poi functionality
PickleRickVE 3f17ad2
added functionality for three different s2cell level - thx @alex
PickleRickVE bd94d61
corrected count of visible points an readme
PickleRickVE 25bc13d
corrected rendering and comma error, moved button 'Get all nest repor…
PickleRickVE 45ccaa3
added selectable tileset in settings
PickleRickVE b427f8c
fixed copy to clipboard of get output
PickleRickVE 43c02b6
cosmetic change of showing despawn time
PickleRickVE 462d096
added language selection for pokemon names in settings, added french …
PickleRickVE c841599
added multilanguage support with external files
PickleRickVE 05feef5
added function to get to home location
PickleRickVE 0ca94fa
Add files via upload
PickleRickVE 3a6bc59
Update README.md
PickleRickVE 456a856
added optional optimization for shortest possible route
PickleRickVE 5a2d3be
updated README.md
PickleRickVE 5827dcb
Update rdm-tools.php
PickleRickVE f1b8c05
outsourcing the config
PickleRickVE c9344d5
added count of circles in output
PickleRickVE 23fe204
improved calculation of shortest route
PickleRickVE 543aa56
reworked settings of s2cells with max-level 19 (performance) an locke…
PickleRickVE 1915c70
changed osm query
PickleRickVE bdf9c99
changed s2cell function to re-allow L20 cells and improved performance
PickleRickVE 96c42d2
removed a bug
PickleRickVE 2ef4b41
added spawnpoints without despawn time as option to optimize route fu…
PickleRickVE 058be41
added searchfield for cities, deactivated zoomcontrol
PickleRickVE a733dde
added import of administrative boundaries via OSM
PickleRickVE fda444c
reactivated zoom control
PickleRickVE d469c2d
added count of pois in s2l14 cells with label on map and option in se…
PickleRickVE 0e49ef7
Merge remote-tracking branch 'origin/master'
PickleRickVE 9084b42
Revert "Merge remote-tracking branch 'origin/master'"
PickleRickVE 37add47
changed way of importing polygon instances to single polygons, not a …
PickleRickVE ddb2c72
added import for and displaying of wayfarer submissions including 20m…
PickleRickVE 3b340e4
added support for specific csv format for importing submissions from …
PickleRickVE 09a5b01
changed marker for submissions and added the photo to the popup
PickleRickVE 7291fee
changed color of touched s2l15 cells to black for differentiating if …
PickleRickVE 9abea1b
improved some code
PickleRickVE 3c5b7ff
added option in config for own tileset, made some grammatical optimiz…
PickleRickVE e5c9d23
added polygon export in PoracleJS format & copy function
PickleRickVE 8017d38
added option for hiding spawnpoints last updated before a specific date
PickleRickVE e9ea34c
added passive mode for imported circle instances
PickleRickVE 3669be2
corrected naming fault
PickleRickVE 0965d02
corrected naming fault
PickleRickVE 34d7b62
improved performance - all pois in bound were loaded before, even if …
PickleRickVE c1e6d73
Update README.md
PickleRickVE 08b4c90
Update README.md
PickleRickVE a3aad32
optimized komma handling in import function and increased zoom for s2…
PickleRickVE 229a5f2
added function to place own POIs and made their markers draggable wit…
PickleRickVE 0167bb7
fixed spawnreport
PickleRickVE 88103da
fixed copy function for circle output
PickleRickVE 3d875ee
added average points per circle in output
PickleRickVE 8729e64
fixed count of points in circles and cells. Previously only visible p…
PickleRickVE e132757
Export of multiple polygons at once in json-, poracle geofences- & pm…
PickleRickVE 39a861f
built in a color picker for instances instead of a text-field
PickleRickVE 8f4c57b
added color picker for polygon import
PickleRickVE 3f099f1
solved issue #5 - tapping key 6 no longer zooms out
PickleRickVE 1e494e5
added autogeneration of the correct circle size for raid instances de…
PickleRickVE fd12479
added tileserver with satellite view
PickleRickVE e15eb75
(re)added option for custom radius when importing instances
PickleRickVE a49416a
added individual handling of instances and multi select on export
PickleRickVE 5cffd6d
fixed handling for generated circles
PickleRickVE 820792b
fixed handling for optimized circles
PickleRickVE e27ea44
complete rework and some great new functions
PickleRickVE 81deae2
added french translation
PickleRickVE 5c4e0de
removed old files
PickleRickVE a9d4d86
fixed single polygon export for administrative units
PickleRickVE 98620c8
added check for missed quests with selectable instances
PickleRickVE c4d56ca
changed to right version for missed quests
PickleRickVE 682356f
changed circle generation to bootstrap without s2cells and added an o…
PickleRickVE 3ff9aa0
added last update to popup of gyms & stops
PickleRickVE 29a0d93
added consideration of 'deleted'-column of pokestop table
PickleRickVE 264d92a
added optional use of password protection via .htaccess - initial use…
PickleRickVE 2db06ef
Added radius and coordinates to circle popup, added free circle tool …
PickleRickVE 132bb57
Added circle size for 1gb devices in settings.
PickleRickVE b1b51fc
fixed unknown points function and generally optimized loading of data
PickleRickVE 0aa4d8f
fixed a bug that prevented output when deleting a circle from bootstr…
PickleRickVE 6b4474c
fixed getting to the wrong world when completely zoomed out
PickleRickVE 400ec60
added some osm tags for nest identification
PickleRickVE 506a1cb
add path counter and lat,lon to circle popup
lenisko f9867ab
rename to Circle Counter - as it's not counter
lenisko b98943c
don't save counter in passive mode
lenisko 5252e3f
config.env.php
123FLO321 e9337ae
use config.env.php as default config
123FLO321 d035ba1
Update config.env.php
123FLO321 45e4127
Merge pull request #10 from lenisko/circle_popup_addition
PickleRickVE 62d2dd3
adjusted circle popup
PickleRickVE d481f8e
Merge pull request #12 from 123FLO321/docker
PickleRickVE 5c3fb76
Delete config.example.php
PickleRickVE 081352c
preserve osm id and name of manually imported nests or polygons
PickleRickVE ba5f84f
support for pmsf's manualdb | read & write nests | write nestpokemon …
PickleRickVE 588f12e
added length for instance and area for polygons on the associated pop…
PickleRickVE 8c0ece9
adjustable options/query for importing nests from osm, function moved…
PickleRickVE 275c239
fixed and added some parts of polygon import
PickleRickVE 8e95280
added automatic calculation of actual nest migration date
PickleRickVE e181251
fixed import of polygon instances
PickleRickVE 0440cce
added circle_smart_pokemon instance type
PickleRickVE 43d6cd8
Fix: added option in config to switch manualdb support on or off, sta…
PickleRickVE c4edd65
added function to merge polygons and changed simple export of polygons
PickleRickVE e1c101b
Fixed several errors where empty lines or garbage input would crash t…
Deses d4515be
Fixed errors in the polygon section
Deses 55d9765
Made the comparators more strict.
Deses 7c1066a
Added one more level to the Administrative Boundaries. Some regions a…
Deses 1c6b3f9
Removed a bunch of duplicated code.
Deses 4c6e038
Fix to Circle Radius Calculator
Deses 0ed20b6
More cleanup.
Deses cf7211a
Added an option (by default disabled) to show or hide S2 cells on big…
Deses d9b1404
Fixed a regression.
Deses 61b9f53
Found another regression.
Deses 15dbb05
bruh.
Deses 7f45a5f
Enabling the delete feture button could be useful. Way faster than ha…
Deses 0c41347
More small optimizations.
Deses 1e7a47d
Clear the bootstrap layer (initial circle array) when optimizing to r…
Deses 8e88764
$("#modalLoading").modal('hide'); was in the wrong place, so it was n…
Deses 78f1901
Merge pull request #17 from Deses/fix-import-empty-lines
PickleRickVE 01d5ef6
update config.php usage
Fabio1988 1779d9d
Merge pull request #18 from Fabio1988/patch-2
PickleRickVE 595884e
added support for 9x9 cell scanning
PickleRickVE dadb26b
Add files via upload
PickleRickVE fe8fb5a
Update index.php
ReuschelCGN 39dd621
Update index.php
ReuschelCGN b3edaf9
Merge pull request #19 from ReuschelCGN/master
PickleRickVE 6f38c5c
removed old 1gb device support and added v2.0 support instead plus fi…
PickleRickVE c03d73a
added import for 9x9 instances via checkbox
PickleRickVE f9978d6
changed method for selection of import instance type to radio buttons
PickleRickVE 495f734
Docker Support updates & README changes
MC0R3 063767e
Update README.md
MC0R3 ba0193c
Update README.md
MC0R3 741a57a
Update docker-compose.example.yml
MC0R3 4a38106
Update Dockerfile
MC0R3 b18fa61
added bootstrapping for 9x9
PickleRickVE 25a2bc9
changed spawnpoint query from updated to last_seen and added scrub as…
PickleRickVE 0e638a6
Merge pull request #21 from MC0R3/master
PickleRickVE a4c332f
create docker workflow
Fabio1988 761e3e8
Merge pull request #22 from Fabio1988/patch-3
PickleRickVE 879384c
fixed 9x9 bootstrap
PickleRickVE ec629da
Update docker-compose.example.yml
Fabio1988 d223339
Merge pull request #23 from Fabio1988/patch-3
PickleRickVE File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,24 +4,29 @@ Tools for managing RealDeviceMap data | |
|
|
||
| ## 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 | ||
| * spawnpoint color is different for verified despawn time | ||
| * changed charset for db to utf8mb4 | ||
| * adjusted date of last change of osm nest data | ||
| * lighter tileset for better performance | ||
| * included names for new gens, german names available | ||
|
|
||
| ### 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"] | ||
| * [date:"2019-04-09T01:32:00Z"] | ||
| * way["leisure"="park"] | ||
| * way["leisure"="recreation_ground"] | ||
| * way["landuse"="recreation_ground"] | ||
| * way[leisure=playground] | ||
| * way[landuse=meadow] | ||
| * 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 | ||
| * GeoJSON polygon import as Nest allows to maintain an own list of nests | ||
| * Show 70m range around stops | ||
|
|
||
| ### 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. | ||
|
|
@@ -43,12 +48,13 @@ The map has a variety of control buttons for performing different functions: | |
| *  Enables/disables viewing gyms as red dots on the map. | ||
| *  Enables/disables viewing pokestops as green dots on the map. | ||
| *  Enables/disables viewing spawnpoints as blue dots on the map. | ||
| *  Enables/disables viewing of 70m range around pokestops as light green circles. | ||
|
|
||
| #### Routing and Drawing | ||
| *  Enables drawing of polygons on the map. | ||
| *  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. | ||
| *  Pulls nest data from OSM and places polygons in the current map bounds covering all parks. | ||
| *  Import CSV or GeoJSON polygon data. GeoJSON can contain multiple polygons, each one will be placed individually. | ||
| *  Import CSV or GeoJSON polygon data. GeoJSON can contain multiple polygons, each one will be placed individually. Choose wether to import as editable polygon(s) or nest(s). | ||
|
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. s/wether/whether/g ;) |
||
| *  Imports an instance from your RDM DB and places the route points in the routing layer based on view radius setting. | ||
| *  Clears the current route from the map, leaving polygons behind | ||
| *  Clears all route points and polygons from map. | ||
|
|
||
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| {"type":"FeatureCollection","features":[ | ||
| {"type":"Feature","properties":{"name":"Central Park","description":null},"geometry":{"type":"Polygon","coordinates":[[[-73.957868,40.800521],[-73.957908,40.800455],[-73.958054,40.800362],[-73.958203,40.800345],[-73.95834,40.800373],[-73.966284,40.789512],[-73.968405,40.786604],[-73.974997,40.777533],[-73.981012,40.769104],[-73.981388,40.768578],[-73.981448,40.768497],[-73.981294,40.768338],[-73.981235,40.768242],[-73.981208,40.768164],[-73.981196,40.768058],[-73.981225,40.767938],[-73.981196,40.767894],[-73.973638,40.764718],[-73.973296,40.765195],[-73.973169,40.765232],[-73.973032,40.765219],[-73.972604,40.765045],[-73.972499,40.765072],[-73.963476,40.777373],[-73.96075,40.781091],[-73.94922,40.79688],[-73.949737,40.797098],[-73.957868,40.800521]]]}} | ||
| {"type":"Feature","properties":{"name":"Randalls Island Park","description":null},"geometry":{"type":"Polygon","coordinates":[[[-73.927403,40.798498],[-73.927471,40.798135],[-73.927454,40.797836],[-73.927377,40.797603],[-73.927289,40.797428],[-73.927177,40.797431],[-73.927184,40.797364],[-73.927054,40.797069],[-73.926952,40.796764],[-73.926905,40.796327],[-73.9269,40.796108],[-73.926915,40.795884],[-73.927072,40.795139],[-73.927174,40.79499],[-73.927234,40.794817],[-73.927288,40.794639],[-73.927355,40.794465],[-73.927904,40.79371],[-73.928201,40.793307],[-73.928269,40.793211],[-73.928302,40.793163],[-73.928326,40.793106],[-73.928336,40.793041],[-73.928343,40.792972],[-73.928323,40.792642],[-73.928289,40.79245],[-73.92826,40.792353],[-73.928248,40.792329],[-73.928064,40.792186],[-73.927864,40.792045],[-73.927828,40.792021],[-73.927773,40.792002],[-73.927681,40.791983],[-73.927217,40.79194],[-73.927243,40.791853],[-73.92743,40.791652],[-73.927602,40.791425],[-73.927836,40.791176],[-73.927917,40.791075],[-73.927821,40.790949],[-73.927577,40.790949],[-73.927447,40.790972],[-73.927376,40.791007],[-73.927121,40.79103],[-73.926873,40.791001],[-73.926652,40.790977],[-73.926534,40.791017],[-73.926423,40.791102],[-73.926343,40.791309],[-73.926326,40.791471],[-73.92635,40.791578],[-73.926384,40.79168],[-73.926449,40.791735],[-73.926457,40.791742],[-73.926537,40.791793],[-73.926622,40.791818],[-73.926699,40.79183],[-73.926767,40.791947],[-73.926524,40.791947],[-73.926381,40.791933],[-73.926151,40.791905],[-73.926184,40.791856],[-73.926321,40.791893],[-73.926489,40.791896],[-73.926555,40.791913],[-73.92658,40.791869],[-73.926533,40.791838],[-73.926373,40.79178],[-73.926184,40.791753],[-73.926168,40.791602],[-73.926115,40.791473],[-73.926069,40.791329],[-73.926067,40.791203],[-73.92613,40.791047],[-73.926049,40.790939],[-73.926046,40.790879],[-73.926093,40.790799],[-73.926106,40.790792],[-73.926228,40.790724],[-73.926352,40.790729],[-73.926608,40.790739],[-73.926838,40.790759],[-73.927048,40.790819],[-73.927262,40.790841],[-73.927396,40.79087],[-73.927535,40.790876],[-73.927838,40.790811],[-73.928034,40.790805],[-73.928384,40.79093],[-73.928738,40.790948],[-73.929661,40.79136],[-73.929737,40.791364],[-73.929459,40.791107],[-73.928778,40.790842],[-73.928797,40.790704],[-73.928014,40.790596],[-73.927519,40.790634],[-73.927244,40.790641],[-73.926871,40.790517],[-73.926704,40.790094],[-73.926387,40.79043],[-73.926161,40.790676],[-73.925939,40.790917],[-73.925291,40.791637],[-73.923255,40.794336],[-73.922536,40.79536],[-73.921903,40.796343],[-73.92186,40.796773],[-73.922021,40.797163],[-73.922343,40.79748],[-73.922697,40.797634],[-73.923308,40.797691],[-73.924166,40.797926],[-73.925926,40.798787],[-73.926312,40.799104],[-73.926377,40.799299],[-73.925819,40.799835],[-73.925325,40.799786],[-73.924248,40.799337],[-73.924177,40.799307],[-73.922734,40.798678],[-73.922437,40.798548],[-73.92216,40.798235],[-73.921656,40.797983],[-73.920476,40.797756],[-73.920039,40.797729],[-73.919725,40.797496],[-73.919446,40.797033],[-73.919456,40.796781],[-73.919843,40.796245],[-73.920165,40.795985],[-73.920326,40.795758],[-73.922343,40.794028],[-73.924016,40.792363],[-73.924133,40.792298],[-73.926044,40.790194],[-73.926693,40.789484],[-73.926346,40.789447],[-73.926647,40.789136],[-73.926909,40.788848],[-73.927077,40.788661],[-73.927168,40.78856],[-73.927413,40.788278],[-73.927664,40.787993],[-73.928169,40.787425],[-73.928058,40.787352],[-73.927967,40.787293],[-73.927759,40.787249],[-73.927585,40.787009],[-73.92773,40.786953],[-73.927508,40.786849],[-73.927283,40.786735],[-73.926545,40.786382],[-73.926382,40.786314],[-73.926162,40.786223],[-73.926101,40.786184],[-73.926044,40.78614],[-73.926023,40.786076],[-73.925985,40.785742],[-73.925932,40.785719],[-73.925831,40.785877],[-73.925776,40.786044],[-73.925765,40.78616],[-73.925784,40.786259],[-73.92583,40.786444],[-73.925865,40.786623],[-73.925922,40.786584],[-73.92595,40.786688],[-73.925997,40.787052],[-73.926008,40.787256],[-73.926008,40.787448],[-73.926004,40.787481],[-73.925968,40.78751],[-73.925957,40.787706],[-73.925988,40.787695],[-73.925986,40.787729],[-73.925962,40.787982],[-73.925923,40.788209],[-73.925915,40.788252],[-73.925866,40.78827],[-73.925828,40.788432],[-73.925871,40.788419],[-73.925793,40.788663],[-73.925707,40.788905],[-73.925619,40.788925],[-73.925548,40.789078],[-73.925373,40.789424],[-73.925272,40.789617],[-73.925119,40.789635],[-73.922922,40.792091],[-73.923085,40.792204],[-73.923341,40.792381],[-73.923266,40.792469],[-73.923183,40.792457],[-73.92311,40.792511],[-73.922985,40.792607],[-73.922953,40.792646],[-73.922893,40.792767],[-73.922617,40.792779],[-73.922512,40.792783],[-73.922206,40.792861],[-73.92203,40.792743],[-73.921927,40.792674],[-73.92174,40.792609],[-73.921624,40.792591],[-73.92152,40.792584],[-73.921348,40.792633],[-73.921319,40.792642],[-73.920859,40.792777],[-73.920627,40.79286],[-73.920511,40.792907],[-73.920402,40.792951],[-73.920083,40.792809],[-73.919757,40.792657],[-73.919472,40.792531],[-73.91907,40.792352],[-73.918883,40.792269],[-73.918764,40.792216],[-73.918464,40.792083],[-73.918402,40.792054],[-73.917272,40.791549],[-73.916775,40.791326],[-73.916343,40.791137],[-73.91574,40.791656],[-73.915322,40.791981],[-73.915129,40.792168],[-73.914904,40.792436],[-73.914324,40.793199],[-73.913884,40.793808],[-73.913831,40.794028],[-73.91382,40.79432],[-73.913863,40.794547],[-73.913996,40.794836],[-73.914326,40.795287],[-73.915009,40.796441],[-73.915481,40.796981],[-73.916249,40.797537],[-73.917236,40.798081],[-73.918899,40.798698],[-73.92,40.79921],[-73.920332,40.799372],[-73.920633,40.799616],[-73.921019,40.800168],[-73.921201,40.800468],[-73.921377,40.80084],[-73.921617,40.801156],[-73.921888,40.801448],[-73.922679,40.801856],[-73.923506,40.801922],[-73.92421,40.801968],[-73.924323,40.801972],[-73.924965,40.801994],[-73.925343,40.801981],[-73.925566,40.801929],[-73.925738,40.80178],[-73.926748,40.800103],[-73.927043,40.799466],[-73.927285,40.798831],[-73.927403,40.798498]]]}} | ||
| ]} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can you fix this section's grammar/punctuation to match the rest of the document?