Deliver images of marker clusterer

diff --git a/com.woltlab.wcf/templates/googleMapsJavaScript.tpl b/com.woltlab.wcf/templates/googleMapsJavaScript.tpl
index 4b4ecf94870a844fbec361e7e1c73ebd74ecb912..6c29b0c5fe8f17ce7023343de44bf51a7bb4b1a5 100644 (file)
--- a/com.woltlab.wcf/templates/googleMapsJavaScript.tpl
+++ b/com.woltlab.wcf/templates/googleMapsJavaScript.tpl
@@ -14,6 +14,7 @@
                        disableDoubleClickZoom: {if GOOGLE_MAPS_ENABLE_DOUBLE_CLICK_ZOOM}0{else}1{/if},
                        draggable: {@GOOGLE_MAPS_ENABLE_DRAGGING},
                        mapType: '{@GOOGLE_MAPS_TYPE}',
+                       markerClustererImagePath: '{@$__wcf->getPath()}images/markerClusterer/',
                        scaleControl: {@GOOGLE_MAPS_ENABLE_SCALE_CONTROL},
                        scrollwheel: {@GOOGLE_MAPS_ENABLE_SCROLL_WHEEL_ZOOM},
                        type: '{@GOOGLE_MAPS_TYPE}',

diff --git a/wcfsetup/install/files/images/markerClusterer/conv30.png b/wcfsetup/install/files/images/markerClusterer/conv30.png
new file mode 100755 (executable)
index 0000000..a50f61f
Binary files /dev/null and b/wcfsetup/install/files/images/markerClusterer/conv30.png differ

diff --git a/wcfsetup/install/files/images/markerClusterer/conv40.png b/wcfsetup/install/files/images/markerClusterer/conv40.png
new file mode 100755 (executable)
index 0000000..2fe31a5
Binary files /dev/null and b/wcfsetup/install/files/images/markerClusterer/conv40.png differ

diff --git a/wcfsetup/install/files/images/markerClusterer/conv50.png b/wcfsetup/install/files/images/markerClusterer/conv50.png
new file mode 100755 (executable)
index 0000000..cbab98b
Binary files /dev/null and b/wcfsetup/install/files/images/markerClusterer/conv50.png differ

diff --git a/wcfsetup/install/files/images/markerClusterer/heart30.png b/wcfsetup/install/files/images/markerClusterer/heart30.png
new file mode 100755 (executable)
index 0000000..c6067a7
Binary files /dev/null and b/wcfsetup/install/files/images/markerClusterer/heart30.png differ

diff --git a/wcfsetup/install/files/images/markerClusterer/heart40.png b/wcfsetup/install/files/images/markerClusterer/heart40.png
new file mode 100755 (executable)
index 0000000..e79ba0a
Binary files /dev/null and b/wcfsetup/install/files/images/markerClusterer/heart40.png differ

diff --git a/wcfsetup/install/files/images/markerClusterer/heart50.png b/wcfsetup/install/files/images/markerClusterer/heart50.png
new file mode 100755 (executable)
index 0000000..26c2252
Binary files /dev/null and b/wcfsetup/install/files/images/markerClusterer/heart50.png differ

diff --git a/wcfsetup/install/files/images/markerClusterer/m1.png b/wcfsetup/install/files/images/markerClusterer/m1.png
new file mode 100755 (executable)
index 0000000..329ff52
Binary files /dev/null and b/wcfsetup/install/files/images/markerClusterer/m1.png differ

diff --git a/wcfsetup/install/files/images/markerClusterer/m2.png b/wcfsetup/install/files/images/markerClusterer/m2.png
new file mode 100755 (executable)
index 0000000..b999cbc
Binary files /dev/null and b/wcfsetup/install/files/images/markerClusterer/m2.png differ

diff --git a/wcfsetup/install/files/images/markerClusterer/m3.png b/wcfsetup/install/files/images/markerClusterer/m3.png
new file mode 100755 (executable)
index 0000000..9f30b30
Binary files /dev/null and b/wcfsetup/install/files/images/markerClusterer/m3.png differ

diff --git a/wcfsetup/install/files/images/markerClusterer/m4.png b/wcfsetup/install/files/images/markerClusterer/m4.png
new file mode 100755 (executable)
index 0000000..0d3f826
Binary files /dev/null and b/wcfsetup/install/files/images/markerClusterer/m4.png differ

diff --git a/wcfsetup/install/files/images/markerClusterer/m5.png b/wcfsetup/install/files/images/markerClusterer/m5.png
new file mode 100755 (executable)
index 0000000..61387d2
Binary files /dev/null and b/wcfsetup/install/files/images/markerClusterer/m5.png differ

diff --git a/wcfsetup/install/files/images/markerClusterer/people35.png b/wcfsetup/install/files/images/markerClusterer/people35.png
new file mode 100755 (executable)
index 0000000..6a5a209
Binary files /dev/null and b/wcfsetup/install/files/images/markerClusterer/people35.png differ

diff --git a/wcfsetup/install/files/images/markerClusterer/people45.png b/wcfsetup/install/files/images/markerClusterer/people45.png
new file mode 100755 (executable)
index 0000000..219c62e
Binary files /dev/null and b/wcfsetup/install/files/images/markerClusterer/people45.png differ

diff --git a/wcfsetup/install/files/images/markerClusterer/people55.png b/wcfsetup/install/files/images/markerClusterer/people55.png
new file mode 100755 (executable)
index 0000000..6e88d1e
Binary files /dev/null and b/wcfsetup/install/files/images/markerClusterer/people55.png differ

diff --git a/wcfsetup/install/files/images/markerClusterer/pin.png b/wcfsetup/install/files/images/markerClusterer/pin.png
new file mode 100755 (executable)
index 0000000..3f830a3
Binary files /dev/null and b/wcfsetup/install/files/images/markerClusterer/pin.png differ

diff --git a/wcfsetup/install/files/js/WCF.Location.js b/wcfsetup/install/files/js/WCF.Location.js
index fd5961e7c42887be35a97b69eeedc86f9e85aaff..3d9ac3820146880f89070d9954b52b5954fff426 100644 (file)
--- a/wcfsetup/install/files/js/WCF.Location.js
+++ b/wcfsetup/install/files/js/WCF.Location.js
@@ -459,8 +459,7 @@ WCF.Location.GoogleMaps.LargeMap = WCF.Location.GoogleMaps.Map.extend({
                
                this._markerClusterer = new MarkerClusterer(this._map, this._markers, {
                        maxZoom: 17,
-                       // replace default value for https support
-                       imagePath: '//google-maps-utility-library-v3.googlecode.com/svn/trunk/markerclusterer/images/m'
+                       imagePath: WCF.Location.GoogleMaps.Settings.get('markerClustererImagePath') + 'm'
                });
                
                this._markerSpiderfier = new OverlappingMarkerSpiderfier(this._map, {