Changeset 33169 for main/trunk
- Timestamp:
- 2019-06-20T18:40:03+12:00 (5 years ago)
- Location:
- main/trunk/greenstone3/web/interfaces/default/js
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/web/interfaces/default/js/map-scripts-shapes-util.js
r33168 r33169 534 534 } 535 535 536 537 ShapesUtil.numberOfCoordinatesInBounds = function (shape) { 538 if (shape.type === google.maps.drawing.OverlayType.MARKER){ 539 return 1; 540 } else if (shape.type === google.maps.drawing.OverlayType.RECTANGLE) { 541 return 4; 542 } else if (shape.type === google.maps.drawing.OverlayType.CIRCLE) { 543 return 4; // circles have a rectangular/square bounding box, so 4 coordinates to a circle's bounding box 544 } else if (shape.type === google.maps.drawing.OverlayType.POLYLINE || shape.type === google.maps.drawing.OverlayType.POLYGON) { 545 var path = shape.getPath(); 546 return path.length; 547 } 548 549 console.log("Unrecognised shape, can't calculate the number of coordinates in its bounds"); 550 return -1; 551 } 552 536 553 ShapesUtil.overlayBounds = function (overlays) { 537 554 -
main/trunk/greenstone3/web/interfaces/default/js/map-scripts.js
r33168 r33169 347 347 doc.shapes[x].setVisible(false); 348 348 } 349 //markersOnMap += doc.shapes.length;350 349 } else { 351 350 doc.marker.setVisible(false); … … 359 358 for(var x = 0; x < doc.shapes.length; x++) { 360 359 doc.shapes[x].setVisible(true); 361 } 362 markersOnMap += doc.shapes.length; 363 //alert("HERE I AM " + markersOnMap); 364 360 markersOnMap += ShapesUtil.numberOfCoordinatesInBounds(doc.shapes[x]); 361 } 365 362 } else { 366 363 doc.marker.setVisible(true); … … 381 378 if(doc.mapoverlay) { 382 379 console.log("@@@@ HERE IN doc.mapoverlay"); 383 var overlay_bounds = ShapesUtil.overlayBounds(doc.shapes); 384 bounds.extend(overlay_bounds.getNorthEast()); 385 bounds.extend(overlay_bounds.getSouthWest()); 380 bounds = ShapesUtil.overlayBounds(doc.shapes); 386 381 } 387 382 else {
Note:
See TracChangeset
for help on using the changeset viewer.