move third-party libraries to /src/vendor

diff --git a/TODO.md b/TODO.md
index 7625754fce936bb258943d5715a1b09f9c1d9b17..6f5327248a9b1b5ba05bc430783629e9db53dc9c 100644 (file)
--- a/TODO.md
+++ b/TODO.md
@@ -4,15 +4,15 @@
 
 ## Essential
 
 
 ## 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
 * 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: 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
 * 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
 
 
 ## 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
 * 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
 
 
 ## 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
 * 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 f8df67aa693b0fbfd1fa077e7e8c83dcd5710108..af15bd585741e84c5e9b963cefdf8345c4e1dfda 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -3,6 +3,9 @@
 # mkdir dist/
 
 rsync --quiet --recursive src/assets dist/
 # 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/
 
 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 79eeba911b034536d2b004385342dee770523034..8c8c8af57e18ffc4d9f942d269fc9788e6833cf5 100755 (executable)
--- 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,
                 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);
             };
 
             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