Skip to content
Snippets Groups Projects
Commit 829eedc1 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

Merge branch '455-clicking-on-rectangle-in-google-maps-api' into 'master'

Resolve "clicking on rectangle in google maps API"

Closes #455

See merge request !338
parents 7f65902d b688db06
No related branches found
No related tags found
1 merge request!338Resolve "clicking on rectangle in google maps API"
Pipeline #
...@@ -23,6 +23,8 @@ var logger = require('../../../logger'); ...@@ -23,6 +23,8 @@ var logger = require('../../../logger');
function GoogleMapsApiRectangle(options) { function GoogleMapsApiRectangle(options) {
Rectangle.call(this, options); Rectangle.call(this, options);
var self = this;
var bounds = new google.maps.LatLngBounds(); var bounds = new google.maps.LatLngBounds();
bounds.extend(this.getMap().fromPointToLatLng(options.bounds.getTopLeft())); bounds.extend(this.getMap().fromPointToLatLng(options.bounds.getTopLeft()));
bounds.extend(this.getMap().fromPointToLatLng(options.bounds.getRightBottom())); bounds.extend(this.getMap().fromPointToLatLng(options.bounds.getRightBottom()));
......
...@@ -6,6 +6,7 @@ var logger = require('../../../logger'); ...@@ -6,6 +6,7 @@ var logger = require('../../../logger');
var GoogleMapsApiCanvas = require('../../../../../main/js/map/canvas/GoogleMaps/GoogleMapsApiCanvas'); var GoogleMapsApiCanvas = require('../../../../../main/js/map/canvas/GoogleMaps/GoogleMapsApiCanvas');
var Point = require('../../../../../main/js/map/canvas/Point'); var Point = require('../../../../../main/js/map/canvas/Point');
var Bounds = require('../../../../../main/js/map/canvas/Bounds');
var SelectionContextMenu = require('../../../../../main/js/gui/SelectionContextMenu'); var SelectionContextMenu = require('../../../../../main/js/gui/SelectionContextMenu');
...@@ -18,6 +19,8 @@ describe('GoogleMapsApiCanvas', function () { ...@@ -18,6 +19,8 @@ describe('GoogleMapsApiCanvas', function () {
tileSize: 256, tileSize: 256,
width: 300, width: 300,
height: 600, height: 600,
minZoom: 2,
zoom: 5,
backgroundOverlays: [{ backgroundOverlays: [{
id: 1, id: 1,
name: "overlay", name: "overlay",
...@@ -198,4 +201,18 @@ describe('GoogleMapsApiCanvas', function () { ...@@ -198,4 +201,18 @@ describe('GoogleMapsApiCanvas', function () {
assert.equal(map.getMapCanvas().getSelectedArea(), null); assert.equal(map.getMapCanvas().getSelectedArea(), null);
}); });
it("click on rectangle", function () {
var canvas = new GoogleMapsApiCanvas(testDiv, testOptions);
var rectangle = canvas.createRectangle({
fillOpacity: 0.7,
strokeColor: "#330000",
strokeOpacity: 0.5,
strokeWeight: 1.0,
id:"1",
fillColor: "#00FF00",
bounds: new Bounds(new Point(0,0), new Point(2,2))
});
return google.maps.event.trigger(rectangle.getGoogleRectangle(), "click");
});
}); });
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment