From b898aafe5184497387dede3f6bf441eee0b5afde Mon Sep 17 00:00:00 2001
From: David Molineus <david.molineus@netzmacht.de>
Date: Mon, 9 Oct 2017 16:05:34 +0200
Subject: [PATCH] Rearrange assets.

---
 .gitattributes                               | 1 +
 assets/js/.keep                              | 0
 assets/maps/contao-leaflet.js                | 1 -
 gulpfile.js                                  | 4 ++--
 {assets/maps/src => js}/Contao.js            | 0
 {assets/maps/src => js}/Mixin.Attribution.js | 0
 {assets/maps/src => js}/Mixin.GeoJSON.js     | 0
 {assets/maps/src => js}/Mixin.Map.js         | 0
 {assets/maps/src => js}/OverpassLayer.js     | 0
 src/Listener/LoadAssetsListener.php          | 2 +-
 10 files changed, 4 insertions(+), 4 deletions(-)
 delete mode 100644 assets/js/.keep
 delete mode 100644 assets/maps/contao-leaflet.js
 rename {assets/maps/src => js}/Contao.js (100%)
 rename {assets/maps/src => js}/Mixin.Attribution.js (100%)
 rename {assets/maps/src => js}/Mixin.GeoJSON.js (100%)
 rename {assets/maps/src => js}/Mixin.Map.js (100%)
 rename {assets/maps/src => js}/OverpassLayer.js (100%)

diff --git a/.gitattributes b/.gitattributes
index 06d085f..618a292 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -8,3 +8,4 @@ build.xml export-ignore
 phpunit.xml.dist export-ignore
 /tests export-ignore
 /specs export-ignore
+/js export-ignore
diff --git a/assets/js/.keep b/assets/js/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/assets/maps/contao-leaflet.js b/assets/maps/contao-leaflet.js
deleted file mode 100644
index 9414982..0000000
--- a/assets/maps/contao-leaflet.js
+++ /dev/null
@@ -1 +0,0 @@
-L.Contao=L.Class.extend({includes:L.Mixin.Events,statics:{ATTRIBUTION:' | <a href="https://netzmacht.de/contao-leaflet" title="Powered by Leaflet extension for Contao CMS developed by netzmacht David Molineus">netzmacht</a>'},maps:{},icons:{},initialize:function(){L.Icon.Default.imagePath="assets/leaflet/libs/leaflet/images/",this.setGeoJsonListeners(L.GeoJSON)},addMap:function(t,o){return this.maps[t]=o,this.fire("map:added",{id:t,map:o}),this},getMap:function(t){return"undefined"==typeof this.maps[t]?null:this.maps[t]},addIcon:function(t,o){return this.icons[t]=o,this.fire("icon:added",{id:t,icon:o}),this},loadIcons:function(t){for(var o=0;o<t.length;o++){var e;e="extraMarkers.icon"===t[o].type?L.ExtraMarkers.icon(t[o].options):L[t[o].type](t[o].options),this.addIcon(t[o].id,e)}},getIcon:function(t){return"undefined"==typeof this.icons[t]?null:this.icons[t]},load:function(t,o,e,n,i){var s=this.createRequestUrl(t,i),r=omnivore[o](s,e,n);return i&&(L.stamp(r),i.options.dynamicLoad&&"fit"==r.options.boundsMode&&(r.options.requestHash=t,i.on("moveend",r.refreshData,r),i.on("layerremove",function(t){t.layer===r&&i.off("moveend",r.updateBounds,r)})),i.fire("dataloading",{layer:r}),r.on("ready",function(){i.calculateFeatureBounds(r),i.fire("dataload",{layer:r})}),r.on("error",function(){i.fire("dataload",{layer:r})})),r},pointToLayer:function(t,o){var e="marker",n=null;if(t.properties&&(t.properties.bounds=!0,t.properties.type&&(e=t.properties.type),t.properties.arguments&&(n=L[e].apply(L[e],t.properties.arguments),L.Util.setOptions(n,t.properties.options))),null===n&&(n=L[e](o,t.properties.options)),t.properties){if(t.properties.radius&&n.setRadius(t.properties.radius),t.properties.icon){var i=this.getIcon(t.properties.icon);i&&n.setIcon(i)}this.bindPopupFromFeature(n,t)}return this.fire("point:added",{marker:n,feature:t,latlng:o,type:e}),n},onEachFeature:function(t,o){t.properties&&(L.Util.setOptions(o,t.properties.options),this.bindPopupFromFeature(o,t),this.fire("feature:added",{feature:t,layer:o}))},bindPopupFromFeature:function(t,o){o.properties&&(o.properties.popup?t.bindPopup(o.properties.popup,o.properties.popupOptions):o.properties.popupContent&&t.bindPopup(o.properties.popupContent,o.properties.popupOptions))},setGeoJsonListeners:function(t){t&&t.prototype&&(t.prototype.options={pointToLayer:this.pointToLayer.bind(this),onEachFeature:this.onEachFeature.bind(this)})},createRequestUrl:function(t,o){var e,n="leaflet",i=document.location.search.substr(1).split("&");if(t=encodeURIComponent(t),""==i)t=document.location.pathname+"?"+[n,t].join("=");else{for(var s,r=i.length;r--;)if(s=i[r].split("="),s[0]==n){s[1]=t,i[r]=s.join("=");break}r<0&&(i[i.length]=[n,t].join("=")),t=document.location.pathname+"?"+i.join("&")}return o&&o.options.dynamicLoad&&(e=o.getBounds(),t+="&f=bbox&v=",t+=e.getSouth()+","+e.getWest(),t+=","+e.getNorth()+","+e.getEast()),t}}),L.contao=new L.Contao,L.Control.Attribution.addInitHook(function(){this.options.prefix+=L.Contao.ATTRIBUTION}),L.Control.Attribution.include({setPrefix:function(t){return t.indexOf(L.Contao.ATTRIBUTION)===-1&&(t+=L.Contao.ATTRIBUTION),this.options.prefix=t,this._update(),this}}),L.GeoJSON.include({refreshData:function(t){var o=L.geoJson(),e=this;o.on("ready",function(){var t,o=e.getLayers();for(t=0;t<o.length;t++)e.removeLayer(o[t]);for(o=this.getLayers(),t=0;t<o.length;t++)this.removeLayer(o[t]),e.addLayer(o[t])}),omnivore.geojson(L.contao.createRequestUrl(this.options.requestHash,t.target),null,o)}}),L.Map.include({_dynamicBounds:null,calculateFeatureBounds:function(t,o){if(t){if(!this.options.adjustBounds&&!o)return;this._scanForBounds(t)}else this.eachLayer(this._scanForBounds,this);this._dynamicBounds&&this.fitBounds(this._dynamicBounds,this.getBoundsOptions())},getBoundsOptions:function(){return options={},this.options.boundsPadding?options.padding=this.options.boundsPadding:(this.options.boundsPaddingTopLeft&&(options.paddingTopLeft=this.options.boundsPaddingTopLeft),this.options.boundsPaddingBottomRight&&(options.paddingBottomRight=this.options.boundsPaddingBottomRight)),options},_scanForBounds:function(t){var o;!t.feature||t.feature.properties&&t.feature.properties.ignoreForBounds?L.MarkerClusterGroup&&t instanceof L.MarkerClusterGroup&&t.options.boundsMode&&"extend"==t.options.boundsMode?(o=t.getBounds(),o.isValid()&&(this._dynamicBounds?this._dynamicBounds.extend(o):this._dynamicBounds=L.latLngBounds(o.getSouthWest(),o.getNorthEast()))):(!t.options||t.options&&t.options.boundsMode&&!t.options.ignoreForBounds)&&t.eachLayer&&t.eachLayer(this._scanForBounds,this):t.getBounds?(o=t.getBounds(),o.isValid()&&(this._dynamicBounds?this._dynamicBounds.extend(o):this._dynamicBounds=L.latLngBounds(o.getSouthWest(),o.getNorthEast()))):t.getLatLng&&(o=t.getLatLng(),this._dynamicBounds?this._dynamicBounds.extend(o):this._dynamicBounds=L.latLngBounds(o,o))}}),L.LatLngBounds.prototype.toOverpassBBoxString=function(){var t=this._southWest,o=this._northEast;return[t.lat,t.lng,o.lat,o.lng].join(",")},L.OverPassLayer=L.FeatureGroup.extend({options:{minZoom:0,endpoint:"//overpass-api.de/api/",query:"(node(BBOX)[organic];node(BBOX)[second_hand];);out qt;",amenityIcons:{}},initialize:function(t){t.pointToLayer||(t.pointToLayer=this.pointToLayer),t.onEachFeature||(t.onEachFeature=this.onEachFeature),L.Util.setOptions(this,t),this.options.dynamicLoad=!!this.options.query.match(/BBOX/g),this._layer=L.geoJson(),this._layers={},this.addLayer(this._layer)},refreshData:function(){if(!(this._map.getZoom()<this.options.minZoom)){var t=this._map.getBounds().toOverpassBBoxString(),o=this.options.query.replace(/(BBOX)/g,t),e=this.options.endpoint+"interpreter?data=[out:json];"+o;this._map.fire("dataloading",{layer:this}),this.request(e,function(t,o){var e=JSON.parse(o.response),n=osmtogeojson(e),i=L.geoJson(n,{pointToLayer:this.options.pointToLayer.bind(this),onEachFeature:this.options.onEachFeature.bind(this)});if(this.addLayer(i),this.removeLayer(this._layer),this._layer=i,"extend"===this.options.boundsMode&&i.getBounds().isValid()){var s=this._map.getBounds();s=s.extend(i.getBounds()),this._map.fitBounds(s,this._map.getBoundsOptions())}this._map.fire("dataload",{layer:this})}.bind(this))}},onAdd:function(t){"fit"===this.options.boundsMode&&this.options.dynamicLoad&&t.on("moveend",this.refreshData,this),this.refreshData()},pointToLayer:function(t,o){var e="marker",n=null,i=L.marker(o,t.properties.options);return t.properties&&(t.properties.radius&&i.setRadius(t.properties.radius),t.properties.icon?n=this._map.getIcon(t.properties.icon):t.properties.tags&&t.properties.tags.amenity&&this.options.amenityIcons[t.properties.tags.amenity]&&(n=L.contao.getIcon(this.options.amenityIcons[t.properties.tags.amenity])),n&&i.setIcon(n)),this.options.overpassPopup&&i.bindPopup(this.options.overpassPopup(t,i)),this._map.fire("point:added",{marker:i,feature:t,latlng:o,type:e}),i},onEachFeature:function(t,o){t.properties&&(L.Util.setOptions(o,t.properties.options),this.options.overpassPopup&&o.bindPopup(this.options.overpassPopup(t,o)),this._map.fire("feature:added",{feature:t,layer:o}))},request:function(t,o,e){function n(t){return t>=200&&t<300||304===t}function i(){void 0===a.status||n(a.status)?o.call(a,null,a):o.call(a,a,null)}var s=!1;if("undefined"==typeof window.XMLHttpRequest)return o(Error("Browser not supported"));if("undefined"==typeof e){var r=t.match(/^\s*https?:\/\/[^\/]*/);e=r&&r[0]!==location.protocol+"//"+location.hostname+(location.port?":"+location.port:"")}var a=new window.XMLHttpRequest;if(e&&!("withCredentials"in a)){a=new window.XDomainRequest;var p=o;o=function(){if(s)p.apply(this,arguments);else{var t=this,o=arguments;setTimeout(function(){p.apply(t,o)},0)}}}return"onload"in a?a.onload=i:a.onreadystatechange=function(){4===a.readyState&&i()},a.onerror=function(t){o.call(this,t||!0,null),o=function(){}},a.onprogress=function(){},a.ontimeout=function(t){o.call(this,t,null),o=function(){}},a.onabort=function(t){o.call(this,t,null),o=function(){}},a.open("GET",t,!0),a.send(null),s=!0,a}});
\ No newline at end of file
diff --git a/gulpfile.js b/gulpfile.js
index cd55cd9..c2f3cd3 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -5,8 +5,8 @@ var concat     = require('gulp-concat');
 
 var paths = {
     minified: 'contao-leaflet.js',
-    scripts:  ['assets/maps/src/*.js'],
-    dest:     'assets/maps'
+    scripts:  ['js/*.js'],
+    dest:     'src/Resources/public/js'
 };
 
 gulp.task('clear', function() {
diff --git a/assets/maps/src/Contao.js b/js/Contao.js
similarity index 100%
rename from assets/maps/src/Contao.js
rename to js/Contao.js
diff --git a/assets/maps/src/Mixin.Attribution.js b/js/Mixin.Attribution.js
similarity index 100%
rename from assets/maps/src/Mixin.Attribution.js
rename to js/Mixin.Attribution.js
diff --git a/assets/maps/src/Mixin.GeoJSON.js b/js/Mixin.GeoJSON.js
similarity index 100%
rename from assets/maps/src/Mixin.GeoJSON.js
rename to js/Mixin.GeoJSON.js
diff --git a/assets/maps/src/Mixin.Map.js b/js/Mixin.Map.js
similarity index 100%
rename from assets/maps/src/Mixin.Map.js
rename to js/Mixin.Map.js
diff --git a/assets/maps/src/OverpassLayer.js b/js/OverpassLayer.js
similarity index 100%
rename from assets/maps/src/OverpassLayer.js
rename to js/OverpassLayer.js
diff --git a/src/Listener/LoadAssetsListener.php b/src/Listener/LoadAssetsListener.php
index 58535d6..6ddf39e 100644
--- a/src/Listener/LoadAssetsListener.php
+++ b/src/Listener/LoadAssetsListener.php
@@ -72,7 +72,7 @@ class LoadAssetsListener
     public function onGetJavascriptEvent(): void
     {
         $this->assets->addJavascript(
-            'web/bundles/netzmachtcontaoleaflet/js/contao-leaflet.js',
+            'bundles/netzmachtcontaoleaflet/js/contao-leaflet.js',
             ContaoAssets::TYPE_FILE
         );