Skip to content

Commit

Permalink
Fix OL image paths
Browse files Browse the repository at this point in the history
  • Loading branch information
JeroenDeDauw committed Nov 27, 2018
1 parent 47581a3 commit ecb2f69
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion resources/OpenLayers/ext.maps.openlayers.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

$( document ).ready( function() {

OpenLayers.ImgPath = mw.config.get( 'egMapsScriptPath' ) + '/includes/services/OpenLayers/OpenLayers/img/';
OpenLayers.ImgPath = mw.config.get( 'egMapsScriptPath' ) + '/resources/OpenLayers/OpenLayers/img/';
OpenLayers.IMAGE_RELOAD_ATTEMPTS = 3;
OpenLayers.Util.onImageLoadErrorColor = 'transparent';
OpenLayers.Feature.prototype.popupClass = OpenLayers.Class(
Expand Down
6 changes: 3 additions & 3 deletions resources/OpenLayers/jquery.openlayers.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
this.bounds = null;

OpenLayers._getScriptLocation = function() {
return mw.config.get('wgScriptPath') + '/extensions/Maps/includes/services/OpenLayers/OpenLayers/';
return mw.config.get('wgScriptPath') + '/extensions/Maps/resources/OpenLayers/OpenLayers/';
};

this.getOLMarker = function (markerLayer, markerData) {
Expand All @@ -43,7 +43,7 @@
if (markerData.visitedicon && markerData.visitedicon !== '') {
if(markerData.visitedicon === 'on'){
//when keyword 'on' is set, set visitedicon to a default official marker
markerData.visitedicon = mw.config.get('wgScriptPath')+'/extensions/Maps/includes/services/OpenLayers/OpenLayers/img/marker3.png';
markerData.visitedicon = mw.config.get('wgScriptPath')+'/extensions/Maps/resources/OpenLayers/OpenLayers/img/marker3.png';
}
marker.setUrl(markerData.visitedicon);
markerData.visitedicon = undefined;
Expand Down Expand Up @@ -86,7 +86,7 @@
this.groups++;
curLayer.id = 'markerLayer' + this.groups;
// define default icon, one of ten in different colors, if more than ten layers, colors will repeat:
curLayer.defaultIcon = mw.config.get( 'egMapsScriptPath' ) + '/includes/services/OpenLayers/OpenLayers/img/marker' + ( ( this.groups + 10 ) % 10 ) + '.png';
curLayer.defaultIcon = mw.config.get( 'egMapsScriptPath' ) + '/resources/OpenLayers/OpenLayers/img/marker' + ( ( this.groups + 10 ) % 10 ) + '.png';
map.addLayer(curLayer);
this.groupLayers[ markerData.group ] = curLayer;
} else {
Expand Down
2 changes: 1 addition & 1 deletion resources/ext.maps.services.js
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
mw.loader.using( 'ext.maps.openlayers' ).done( function () {

if ( typeof OpenLayers !== 'undefined' ) {
OpenLayers.ImgPath = mw.config.get( 'egMapsScriptPath' ) + '/includes/services/OpenLayers/OpenLayers/img/';
OpenLayers.ImgPath = mw.config.get( 'egMapsScriptPath' ) + '/resources/OpenLayers/OpenLayers/img/';
OpenLayers.IMAGE_RELOAD_ATTEMPTS = 3;
OpenLayers.Util.onImageLoadErrorColor = 'transparent';
OpenLayers.Feature.prototype.popupClass = OpenLayers.Class(
Expand Down

0 comments on commit ecb2f69

Please sign in to comment.