From: Matthias Schmidt Date: Wed, 18 May 2016 14:46:03 +0000 (+0200) Subject: Deliver images of marker clusterer X-Git-Tag: 2.1.11~26 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=73c4ffca6173288b8c4b5cf752ebc942161c1279;p=GitHub%2FWoltLab%2FWCF.git Deliver images of marker clusterer --- diff --git a/com.woltlab.wcf/templates/googleMapsJavaScript.tpl b/com.woltlab.wcf/templates/googleMapsJavaScript.tpl index 4b4ecf9487..6c29b0c5fe 100644 --- 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 index 0000000000..a50f61f0b9 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 index 0000000000..2fe31a5758 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 index 0000000000..cbab98b318 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 index 0000000000..c6067a7e6c 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 index 0000000000..e79ba0a1b1 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 index 0000000000..26c2252477 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 index 0000000000..329ff524c5 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 index 0000000000..b999cbcf69 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 index 0000000000..9f30b3092b 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 index 0000000000..0d3f8263bd 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 index 0000000000..61387d2ab5 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 index 0000000000..6a5a209dec 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 index 0000000000..219c62e41d 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 index 0000000000..6e88d1ef05 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 index 0000000000..3f830a3166 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 fd5961e7c4..3d9ac38201 100644 --- 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, {