From c12330104f073b05bc2975ac6bf7afe186b8cc1b Mon Sep 17 00:00:00 2001 From: marc tobias Date: Fri, 2 Mar 2018 11:26:27 +0100 Subject: [PATCH] move third-party libraries to /src/vendor --- TODO.md | 8 +++++--- build.sh | 3 +++ src/assets/js/nominatim-ui.js | 2 +- src/{assets => vendor}/css/Control.Minimap.min.css | 0 src/{assets => vendor}/css/bootstrap-theme.min.css | 0 src/{assets => vendor}/css/bootstrap.min.css | 0 .../css/images/marker-icon-2x.png | Bin src/{assets => vendor}/css/images/marker-icon.png | Bin src/{assets => vendor}/css/images/marker-shadow.png | Bin src/{assets => vendor}/css/images/toggle.png | Bin src/{assets => vendor}/css/images/toggle.svg | 0 src/{assets => vendor}/css/leaflet.css | 0 src/{assets => vendor}/css/search.css | 0 src/{assets => vendor}/images/crosshair.png | Bin src/{assets => vendor}/images/layers-2x.png | Bin src/{assets => vendor}/images/layers.png | Bin src/{assets => vendor}/js/Control.Minimap.min.js | 0 src/{assets => vendor}/js/bootstrap.min.js | 0 src/{assets => vendor}/js/images/marker-icon-2x.png | Bin src/{assets => vendor}/js/images/marker-icon.png | Bin src/{assets => vendor}/js/images/marker-shadow.png | Bin src/{assets => vendor}/js/jquery.min.js | 0 src/{assets => vendor}/js/leaflet.min.js | 0 23 files changed, 9 insertions(+), 4 deletions(-) rename src/{assets => vendor}/css/Control.Minimap.min.css (100%) rename src/{assets => vendor}/css/bootstrap-theme.min.css (100%) rename src/{assets => vendor}/css/bootstrap.min.css (100%) rename src/{assets => vendor}/css/images/marker-icon-2x.png (100%) rename src/{assets => vendor}/css/images/marker-icon.png (100%) rename src/{assets => vendor}/css/images/marker-shadow.png (100%) rename src/{assets => vendor}/css/images/toggle.png (100%) rename src/{assets => vendor}/css/images/toggle.svg (100%) rename src/{assets => vendor}/css/leaflet.css (100%) rename src/{assets => vendor}/css/search.css (100%) rename src/{assets => vendor}/images/crosshair.png (100%) rename src/{assets => vendor}/images/layers-2x.png (100%) rename src/{assets => vendor}/images/layers.png (100%) rename src/{assets => vendor}/js/Control.Minimap.min.js (100%) rename src/{assets => vendor}/js/bootstrap.min.js (100%) rename src/{assets => vendor}/js/images/marker-icon-2x.png (100%) rename src/{assets => vendor}/js/images/marker-icon.png (100%) rename src/{assets => vendor}/js/images/marker-shadow.png (100%) rename src/{assets => vendor}/js/jquery.min.js (100%) rename src/{assets => vendor}/js/leaflet.min.js (100%) diff --git a/TODO.md b/TODO.md index 7625754..6f53272 100644 --- a/TODO.md +++ b/TODO.md @@ -4,15 +4,15 @@ ## Essential +* JS error on http://localhost:8000/reverse.html?format=html&lat=51.72702815704774&lon=8.701171874999998&zoom= * need polyfill for URLSearchParams https://caniuse.com/#feat=urlsearchparams * Nominatim backend API * need /status to support &format=json * need /details to support &format=json -* all pages: "you need javascript enabled" default text * reverse: zoom not set http://localhost:8000/reverse.html?format=html&lat=52.3755991766591&lon=7.646484374999999&zoom= * error message on API error or timeout -* reverse: support `osm_type`, `osm_id` paramters +* detail: support `osm_type`, `osm_id` paramters * search page: add pagination, moreurl * search page: add viewbox * details page: add "There are more child objects which are not shown" back in @@ -36,7 +36,7 @@ http://localhost:8000/reverse.html?format=html&lat=52.3755991766591&lon=7.646484 ## Nice-to-have -* don't show unset parameters in URL, e.g. `&a=&b=&c=1` +* don't show unset parameters in URL, e.g. `&a=&b=&c=1` => '&c=' * different content for official OSM, e.g. github urls * set HTML title * cache `update_data_date` result @@ -52,10 +52,12 @@ http://localhost:8000/reverse.html?format=html&lat=52.3755991766591&lon=7.646484 ## Code cleanup +* we have marker-icon twice * remove Perl dependency from build * show map bounds section => move to handlebar template, map to partial * make sure we use https URL to external sites where possible * aResults vs aPlace vs aFeature variable naming * use CSS preprocessor and linter * use eslint +* add a /vendor directory for third-party files diff --git a/build.sh b/build.sh index f8df67a..af15bd5 100755 --- a/build.sh +++ b/build.sh @@ -3,6 +3,9 @@ # mkdir dist/ rsync --quiet --recursive src/assets dist/ +rsync --quiet --recursive src/vendor/js/* dist/assets/js/ +rsync --quiet --recursive src/vendor/css/* dist/assets/css/ +rsync --quiet --recursive src/vendor/images/* dist/assets/images/ rsync --quiet --recursive src/templates dist/ # rsync --quiet --recursive src/partials dist/ diff --git a/src/assets/js/nominatim-ui.js b/src/assets/js/nominatim-ui.js index 79eeba9..8c8c8af 100755 --- a/src/assets/js/nominatim-ui.js +++ b/src/assets/js/nominatim-ui.js @@ -351,7 +351,7 @@ jQuery(document).ready(function(){ aPlace: aPlace, fLat: api_request_params.lat, fLon: api_request_params.lon, - iZoom: (api_request_params.zoom !== '' ? api_request_params.zoom : undefined) + iZoom: (search_params.get('zoom') !== '' ? api_request_params.zoom : undefined) }; render_template($('main'), 'reversepage-template', context); diff --git a/src/assets/css/Control.Minimap.min.css b/src/vendor/css/Control.Minimap.min.css similarity index 100% rename from src/assets/css/Control.Minimap.min.css rename to src/vendor/css/Control.Minimap.min.css diff --git a/src/assets/css/bootstrap-theme.min.css b/src/vendor/css/bootstrap-theme.min.css similarity index 100% rename from src/assets/css/bootstrap-theme.min.css rename to src/vendor/css/bootstrap-theme.min.css diff --git a/src/assets/css/bootstrap.min.css b/src/vendor/css/bootstrap.min.css similarity index 100% rename from src/assets/css/bootstrap.min.css rename to src/vendor/css/bootstrap.min.css diff --git a/src/assets/css/images/marker-icon-2x.png b/src/vendor/css/images/marker-icon-2x.png similarity index 100% rename from src/assets/css/images/marker-icon-2x.png rename to src/vendor/css/images/marker-icon-2x.png diff --git a/src/assets/css/images/marker-icon.png b/src/vendor/css/images/marker-icon.png similarity index 100% rename from src/assets/css/images/marker-icon.png rename to src/vendor/css/images/marker-icon.png diff --git a/src/assets/css/images/marker-shadow.png b/src/vendor/css/images/marker-shadow.png similarity index 100% rename from src/assets/css/images/marker-shadow.png rename to src/vendor/css/images/marker-shadow.png diff --git a/src/assets/css/images/toggle.png b/src/vendor/css/images/toggle.png similarity index 100% rename from src/assets/css/images/toggle.png rename to src/vendor/css/images/toggle.png diff --git a/src/assets/css/images/toggle.svg b/src/vendor/css/images/toggle.svg similarity index 100% rename from src/assets/css/images/toggle.svg rename to src/vendor/css/images/toggle.svg diff --git a/src/assets/css/leaflet.css b/src/vendor/css/leaflet.css similarity index 100% rename from src/assets/css/leaflet.css rename to src/vendor/css/leaflet.css diff --git a/src/assets/css/search.css b/src/vendor/css/search.css similarity index 100% rename from src/assets/css/search.css rename to src/vendor/css/search.css diff --git a/src/assets/images/crosshair.png b/src/vendor/images/crosshair.png similarity index 100% rename from src/assets/images/crosshair.png rename to src/vendor/images/crosshair.png diff --git a/src/assets/images/layers-2x.png b/src/vendor/images/layers-2x.png similarity index 100% rename from src/assets/images/layers-2x.png rename to src/vendor/images/layers-2x.png diff --git a/src/assets/images/layers.png b/src/vendor/images/layers.png similarity index 100% rename from src/assets/images/layers.png rename to src/vendor/images/layers.png diff --git a/src/assets/js/Control.Minimap.min.js b/src/vendor/js/Control.Minimap.min.js similarity index 100% rename from src/assets/js/Control.Minimap.min.js rename to src/vendor/js/Control.Minimap.min.js diff --git a/src/assets/js/bootstrap.min.js b/src/vendor/js/bootstrap.min.js similarity index 100% rename from src/assets/js/bootstrap.min.js rename to src/vendor/js/bootstrap.min.js diff --git a/src/assets/js/images/marker-icon-2x.png b/src/vendor/js/images/marker-icon-2x.png similarity index 100% rename from src/assets/js/images/marker-icon-2x.png rename to src/vendor/js/images/marker-icon-2x.png diff --git a/src/assets/js/images/marker-icon.png b/src/vendor/js/images/marker-icon.png similarity index 100% rename from src/assets/js/images/marker-icon.png rename to src/vendor/js/images/marker-icon.png diff --git a/src/assets/js/images/marker-shadow.png b/src/vendor/js/images/marker-shadow.png similarity index 100% rename from src/assets/js/images/marker-shadow.png rename to src/vendor/js/images/marker-shadow.png diff --git a/src/assets/js/jquery.min.js b/src/vendor/js/jquery.min.js similarity index 100% rename from src/assets/js/jquery.min.js rename to src/vendor/js/jquery.min.js diff --git a/src/assets/js/leaflet.min.js b/src/vendor/js/leaflet.min.js similarity index 100% rename from src/assets/js/leaflet.min.js rename to src/vendor/js/leaflet.min.js -- 2.39.5