Changeset 32724 for gs3-extensions/map-editor
- Timestamp:
- 2019-01-15T10:08:58+13:00 (5 years ago)
- Location:
- gs3-extensions/map-editor/DrawingManager
- Files:
-
- 5 added
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
gs3-extensions/map-editor/DrawingManager/historyManager.js
r32723 r32724 27 27 28 28 //Deactivated at the moment 29 if (enableSelectionFeature) {30 selectedShapes = [];31 var i = 0;32 var lastEntry = prevOverlays[prevOverlays.length - 1][i];33 console.log(prevOverlays[prevOverlays.length - 1].length);34 35 for (var i = 0; i < lastEntry.length; i++) {36 selectedShapes.push(prevOverlays)37 console.log("comes here");38 }39 40 }29 //if (enableSelectionFeature) { 30 // selectedShapes = []; 31 // var i = 0; 32 // var lastEntry = prevOverlays[prevOverlays.length - 1][i]; 33 // console.log(prevOverlays[prevOverlays.length - 1].length); 34 // 35 // for (var i = 0; i < lastEntry.length; i++) { 36 // selectedShapes.push(prevOverlays) 37 // console.log("comes here"); 38 // } 39 // 40 //} 41 41 } 42 42 … … 144 144 var fillOpacity = rect.fillOpacity; 145 145 var bounds = rect.getBounds(); 146 var type = rect.type; 146 147 //var editable = rect.editable; 147 148 … … 154 155 bounds: bounds, 155 156 draggable: true, 156 editable: false 157 editable: false, 158 type: type 157 159 }); 158 160 … … 238 240 239 241 function historyOverlayPush() { 242 if(undoneOverlays.length > 0) { 243 for(var i = 0; i < undoneOverlays.length; i++) { 244 245 entryType.pop(); 246 } 247 } 240 248 undoneOverlays = []; 241 var overlays_copy = []; 242 for (var i = 0; i < overlays.length; i++) { 243 244 var clone_shape = cloneShape(overlays[i]); 245 if (overlayItemIsShape(clone_shape)) { 246 addShapeListeners(clone_shape, null); // don't have an overlay event! 247 } else { 248 addMarkerListeners(clone_shape, null); // don't have an overlay event! 249 } 250 overlays_copy[i] = clone_shape; 251 } 252 253 prevOverlays.push(overlays_copy); 254 249 //if(resizeEntry){ 250 //prevOverlays.push(presentOverlays[0]); 251 252 //} else { 253 var overlays_copy = []; 254 for (var i = 0; i < overlays.length; i++) { 255 var clone_shape = cloneShape(overlays[i]); 256 if(resizeEntry) { 257 //console.log("hey lol"); 258 clone_shape = cloneShape(presentOverlays[0][i]); 259 } 260 if (overlayItemIsShape(clone_shape)) { 261 addShapeListeners(clone_shape, null); // don't have an overlay event! 262 } else { 263 addMarkerListeners(clone_shape, null); // don't have an overlay event! 264 } 265 overlays_copy[i] = clone_shape; 266 } 267 prevOverlays.push(overlays_copy); 268 //} 255 269 } 256 270 257 271 function presentOverlayPush() { 258 if (resizeEntry) { 259 prevOverlays.push(presentOverlays[0]); 260 } 272 273 //clean the entry type array 274 275 if(resizeEntry) { 276 entryType.push("resize"); 277 } else { 278 entryType.push("not resize"); 279 } 280 261 281 presentOverlays = []; 262 282 var overlays_copy = []; … … 274 294 275 295 function undoneOverlaysPush() { 296 276 297 var conditionUndone = presentOverlays[presentOverlays.length - 1] !== undefined; 277 298 … … 284 305 if (conditionPresent) { 285 306 presentOverlays.push(prevOverlays[prevOverlays.length - 1]); 286 287 } 288 } 307 } 308 } -
gs3-extensions/map-editor/DrawingManager/index.js
r32723 r32724 10 10 var opacityValue = 0.4; 11 11 var overlays = []; 12 var entryType = []; 12 13 var drawingManager; 13 14 var selectedShape; … … 42 43 setSelectedOpacity(opacityValue); 43 44 } 44 45 45 46 document.getElementById("thicknessRange").addEventListener("mousedown", shapeSpecsChangeMD); 46 47 document.getElementById("colourOpacity").addEventListener("mousedown", shapeSpecsChangeMD); … … 51 52 }); 52 53 54 document.addEventListener("mousedown", function(){ 55 56 //console.log(document.body.style.cursor); 57 // console.log(document.getElementById("map").style.cursor); 58 }); 53 59 function shapeSpecsChangeMD() { 54 60 if (selectedShapes.length > 0) { … … 115 121 center: {lat: -34.397, lng: 150.644 116 122 }, 117 zoom: 8,123 zoom: 2, 118 124 }); 119 125 120 126 drawingManager = new google.maps.drawing.DrawingManager({ 121 drawingMode: google.maps.drawing.OverlayType. MARKER,127 drawingMode: google.maps.drawing.OverlayType.RECTANGLE, 122 128 drawingControl: true, 123 129 drawingControlOptions: { … … 138 144 //overlays.push(event.overlay); // store reference to added overlay 139 145 google.maps.event.addListener(drawingManager, 'overlaycomplete', function (e) { 146 console.log(e); 140 147 141 148 historyOverlayPush(); … … 257 264 google.maps.event.addListener(newShape, 'dragstart', function (e) { 258 265 266 267 259 268 beingDragged = true; 260 269 historyOverlayPush(); … … 278 287 279 288 google.maps.event.addListener(newShape, 'drag', function (e) { 289 290 280 291 281 292 //for(var i = 0; i < selectedShapes.length; i++) { … … 287 298 // west: selectedShapes[i].getBounds().ea.j + (selectedShapes[i].getBounds().ea.j - mal) 288 299 // } 289 // selectedShapes[i].set 300 // selectedShapes[i].setBounds 290 301 // } else { 291 302 // 292 303 // } 293 304 // … … 299 310 300 311 google.maps.event.addListener(newShape, 'dragstart', function (e) { 312 313 //faj = newShape.bounds.fa.j; 314 //fal = newShape.bounds.fa.l; 315 //maj = newShape.bounds.ma.j; 316 //mal = newShape.bounds.ma.l; 317 318 //console.log(faj, fal, maj, mal); 319 301 320 302 321 beingDragged = true; … … 315 334 if (beingDragged == false){ 316 335 resizeEntry = true; 336 historyOverlayPush(); 317 337 presentOverlayPush(); 318 338 resizeEntry = false; 319 339 } 340 320 341 }); 321 342 322 343 //Add an event listener to select a shape if the mouse hovers over it 323 344 google.maps.event.addListener(newShape, 'mousedown', function (e) { 345 //console.log(e); 324 346 if (e.vertex !== undefined || e.edge !== undefined) { 325 347 historyOverlayPush() … … 355 377 356 378 //Set selection for the selected overlay 357 function setSelection(shape, e) { 358 if (shape.type !== 'marker') { 359 if (shiftKeyPressed == false) { 360 if (e.vertex == undefined) { 361 if(e.edge == undefined) { 362 clearSelection(); 363 shape.setEditable(true); 364 } 379 function setSelection(shape, e) { 380 if (shape.type !== 'marker') { 381 if (shiftKeyPressed == false) { 382 if (e.vertex == undefined) { 383 if(e.edge == undefined) { 384 clearSelection(); 385 shape.setEditable(true); 365 386 } 366 387 } 367 if (selectedShapes.includes(shape)) {368 if(e.vertex == undefined) {369 if(e.edge == undefined) {370 //removeFromSelectedShapes(shape);371 }388 } 389 if (selectedShapes.includes(shape)) { 390 if(e.vertex == undefined ) { 391 if(e.edge == undefined) { 392 //removeFromSelectedShapes(shape); 372 393 } 373 } else { 374 shape.setEditable(true); 375 selectedShapes.push(shape); 376 } 377 378 379 //Send the values to be updated 380 var thi = shape.strokeWeight; 381 var opa = shape.fillOpacity; 382 var fCol = shape.fillColor; 383 var sCol = shape.strokeColor; 384 updateMenuValues(thi, opa, fCol, sCol); 385 386 } else if (shape.type == 'marker') { 387 clearSelection(); 388 } 389 selectedShape = shape; 390 } 391 394 } 395 } else { 396 shape.setEditable(true); 397 selectedShapes.push(shape); 398 } 399 400 401 //Send the values to be updated 402 var thi = shape.strokeWeight; 403 var opa = shape.fillOpacity; 404 var fCol = shape.fillColor; 405 var sCol = shape.strokeColor; 406 updateMenuValues(thi, opa, fCol, sCol); 407 408 } else if (shape.type == 'marker') { 409 clearSelection(); 410 } 411 selectedShape = shape; 412 } 413 414 function boundsExtraction() { 415 416 417 } 392 418 393 419 function removeFromSelectedShapes(shape) { … … 399 425 } 400 426 allowDeselect = false; 401 } 402 403 427 } 404 428 } 405 429 … … 468 492 } 469 493 494 470 495 function printHistory() { 471 496 console.log("prev", prevOverlays); 472 497 console.log("present ", presentOverlays); 473 498 console.log("undone ", undoneOverlays); 499 console.log(entryType); 474 500 } 475 501
Note:
See TracChangeset
for help on using the changeset viewer.