From 3afb42828f59fb7b7f77dc83bffca7bbf980f167 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Fri, 12 Aug 2016 06:42:58 -0600 Subject: [PATCH] Add Hint and Property as ol.View properties --- changelog/upgrade-notes.md | 2 + src/ol/animation.js | 18 +++---- src/ol/control/overviewmap.js | 10 ++-- src/ol/control/zoomslider.js | 14 +++--- src/ol/interaction/dragpan.js | 8 ++-- src/ol/interaction/dragrotate.js | 8 ++-- src/ol/interaction/dragrotateandzoom.js | 6 +-- src/ol/interaction/modify.js | 10 ++-- src/ol/interaction/pinchrotate.js | 6 +-- src/ol/interaction/pinchzoom.js | 6 +-- src/ol/map.js | 11 ++--- src/ol/renderer/canvas/imagelayer.js | 8 ++-- src/ol/renderer/canvas/vectorlayer.js | 6 +-- src/ol/renderer/dom/imagelayer.js | 6 +-- src/ol/renderer/dom/tilelayer.js | 10 ++-- src/ol/renderer/dom/vectorlayer.js | 6 +-- src/ol/renderer/webgl/imagelayer.js | 6 +-- src/ol/renderer/webgl/vectorlayer.js | 8 ++-- src/ol/view.js | 62 ++++++++++++------------- 19 files changed, 105 insertions(+), 106 deletions(-) diff --git a/changelog/upgrade-notes.md b/changelog/upgrade-notes.md index 1471d0e191..83e3fbd231 100644 --- a/changelog/upgrade-notes.md +++ b/changelog/upgrade-notes.md @@ -18,6 +18,8 @@ A number of internal types have been renamed. This will not affect those who us * rename `ol.CollectionEventType` to `ol.Collection.EventType` * rename `ol.CollectionEvent` to `ol.Collection.Event` + * rename `ol.ViewHint` to `ol.View.Hint` + * rename `ol.ViewProperty` to `ol.View.Property` * rename `ol.render.webgl.imagereplay.shader.Default.Locations` to `ol.render.webgl.imagereplay.defaultshader.Locations` * rename `ol.render.webgl.imagereplay.shader.DefaultFragment` to `ol.render.webgl.imagereplay.defaultshader.Fragment` * rename `ol.render.webgl.imagereplay.shader.DefaultVertex` to `ol.render.webgl.imagereplay.defaultshader.Vertex` diff --git a/src/ol/animation.js b/src/ol/animation.js index d8ccfa4dda..b32d4de422 100644 --- a/src/ol/animation.js +++ b/src/ol/animation.js @@ -1,7 +1,7 @@ goog.provide('ol.animation'); goog.require('ol'); -goog.require('ol.ViewHint'); +goog.require('ol.View'); goog.require('ol.coordinate'); goog.require('ol.easing'); @@ -28,14 +28,14 @@ ol.animation.bounce = function(options) { function(map, frameState) { if (frameState.time < start) { frameState.animate = true; - frameState.viewHints[ol.ViewHint.ANIMATING] += 1; + frameState.viewHints[ol.View.Hint.ANIMATING] += 1; return true; } else if (frameState.time < start + duration) { var delta = easing((frameState.time - start) / duration); var deltaResolution = resolution - frameState.viewState.resolution; frameState.animate = true; frameState.viewState.resolution += delta * deltaResolution; - frameState.viewHints[ol.ViewHint.ANIMATING] += 1; + frameState.viewHints[ol.View.Hint.ANIMATING] += 1; return true; } else { return false; @@ -67,7 +67,7 @@ ol.animation.pan = function(options) { function(map, frameState) { if (frameState.time < start) { frameState.animate = true; - frameState.viewHints[ol.ViewHint.ANIMATING] += 1; + frameState.viewHints[ol.View.Hint.ANIMATING] += 1; return true; } else if (frameState.time < start + duration) { var delta = 1 - easing((frameState.time - start) / duration); @@ -76,7 +76,7 @@ ol.animation.pan = function(options) { frameState.animate = true; frameState.viewState.center[0] += delta * deltaX; frameState.viewState.center[1] += delta * deltaY; - frameState.viewHints[ol.ViewHint.ANIMATING] += 1; + frameState.viewHints[ol.View.Hint.ANIMATING] += 1; return true; } else { return false; @@ -109,7 +109,7 @@ ol.animation.rotate = function(options) { function(map, frameState) { if (frameState.time < start) { frameState.animate = true; - frameState.viewHints[ol.ViewHint.ANIMATING] += 1; + frameState.viewHints[ol.View.Hint.ANIMATING] += 1; return true; } else if (frameState.time < start + duration) { var delta = 1 - easing((frameState.time - start) / duration); @@ -123,7 +123,7 @@ ol.animation.rotate = function(options) { ol.coordinate.rotate(center, deltaRotation); ol.coordinate.add(center, anchor); } - frameState.viewHints[ol.ViewHint.ANIMATING] += 1; + frameState.viewHints[ol.View.Hint.ANIMATING] += 1; return true; } else { return false; @@ -153,7 +153,7 @@ ol.animation.zoom = function(options) { function(map, frameState) { if (frameState.time < start) { frameState.animate = true; - frameState.viewHints[ol.ViewHint.ANIMATING] += 1; + frameState.viewHints[ol.View.Hint.ANIMATING] += 1; return true; } else if (frameState.time < start + duration) { var delta = 1 - easing((frameState.time - start) / duration); @@ -161,7 +161,7 @@ ol.animation.zoom = function(options) { sourceResolution - frameState.viewState.resolution; frameState.animate = true; frameState.viewState.resolution += delta * deltaResolution; - frameState.viewHints[ol.ViewHint.ANIMATING] += 1; + frameState.viewHints[ol.View.Hint.ANIMATING] += 1; return true; } else { return false; diff --git a/src/ol/control/overviewmap.js b/src/ol/control/overviewmap.js index 7d368eb373..3e16a5e616 100644 --- a/src/ol/control/overviewmap.js +++ b/src/ol/control/overviewmap.js @@ -1,7 +1,5 @@ goog.provide('ol.control.OverviewMap'); -goog.require('ol.events'); -goog.require('ol.events.EventType'); goog.require('ol'); goog.require('ol.Collection'); goog.require('ol.Map'); @@ -10,11 +8,13 @@ goog.require('ol.Object'); goog.require('ol.ObjectEventType'); goog.require('ol.Overlay'); goog.require('ol.OverlayPositioning'); -goog.require('ol.ViewProperty'); +goog.require('ol.View'); goog.require('ol.control.Control'); goog.require('ol.coordinate'); goog.require('ol.css'); goog.require('ol.dom'); +goog.require('ol.events'); +goog.require('ol.events.EventType'); goog.require('ol.extent'); @@ -211,7 +211,7 @@ ol.control.OverviewMap.prototype.handleMapPropertyChange_ = function(event) { */ ol.control.OverviewMap.prototype.bindView_ = function(view) { ol.events.listen(view, - ol.Object.getChangeEventType(ol.ViewProperty.ROTATION), + ol.Object.getChangeEventType(ol.View.Property.ROTATION), this.handleRotationChanged_, this); }; @@ -223,7 +223,7 @@ ol.control.OverviewMap.prototype.bindView_ = function(view) { */ ol.control.OverviewMap.prototype.unbindView_ = function(view) { ol.events.unlisten(view, - ol.Object.getChangeEventType(ol.ViewProperty.ROTATION), + ol.Object.getChangeEventType(ol.View.Property.ROTATION), this.handleRotationChanged_, this); }; diff --git a/src/ol/control/zoomslider.js b/src/ol/control/zoomslider.js index 5f92a8441e..0878207992 100644 --- a/src/ol/control/zoomslider.js +++ b/src/ol/control/zoomslider.js @@ -2,16 +2,16 @@ goog.provide('ol.control.ZoomSlider'); -goog.require('ol.events'); -goog.require('ol.events.Event'); -goog.require('ol.events.EventType'); -goog.require('ol.pointer.PointerEventHandler'); -goog.require('ol.ViewHint'); +goog.require('ol.View'); goog.require('ol.animation'); goog.require('ol.control.Control'); goog.require('ol.css'); goog.require('ol.easing'); +goog.require('ol.events'); +goog.require('ol.events.Event'); +goog.require('ol.events.EventType'); goog.require('ol.math'); +goog.require('ol.pointer.PointerEventHandler'); /** @@ -255,7 +255,7 @@ ol.control.ZoomSlider.prototype.handleContainerClick_ = function(event) { ol.control.ZoomSlider.prototype.handleDraggerStart_ = function(event) { if (!this.dragging_ && event.originalEvent.target === this.element.firstElementChild) { - this.getMap().getView().setHint(ol.ViewHint.INTERACTING, 1); + this.getMap().getView().setHint(ol.View.Hint.INTERACTING, 1); this.previousX_ = event.clientX; this.previousY_ = event.clientY; this.dragging_ = true; @@ -306,7 +306,7 @@ ol.control.ZoomSlider.prototype.handleDraggerEnd_ = function(event) { if (this.dragging_) { var map = this.getMap(); var view = map.getView(); - view.setHint(ol.ViewHint.INTERACTING, -1); + view.setHint(ol.View.Hint.INTERACTING, -1); map.beforeRender(ol.animation.zoom({ resolution: /** @type {number} */ (this.currentResolution_), duration: this.duration_, diff --git a/src/ol/interaction/dragpan.js b/src/ol/interaction/dragpan.js index fcad8b3af6..f69596ba12 100644 --- a/src/ol/interaction/dragpan.js +++ b/src/ol/interaction/dragpan.js @@ -1,9 +1,9 @@ goog.provide('ol.interaction.DragPan'); -goog.require('ol.ViewHint'); +goog.require('ol.View'); goog.require('ol.coordinate'); -goog.require('ol.functions'); goog.require('ol.events.condition'); +goog.require('ol.functions'); goog.require('ol.interaction.Pointer'); @@ -115,7 +115,7 @@ ol.interaction.DragPan.handleUpEvent_ = function(mapBrowserEvent) { dest = view.constrainCenter(dest); view.setCenter(dest); } - view.setHint(ol.ViewHint.INTERACTING, -1); + view.setHint(ol.View.Hint.INTERACTING, -1); map.render(); return false; } else { @@ -137,7 +137,7 @@ ol.interaction.DragPan.handleDownEvent_ = function(mapBrowserEvent) { var view = map.getView(); this.lastCentroid = null; if (!this.handlingDownUpSequence) { - view.setHint(ol.ViewHint.INTERACTING, 1); + view.setHint(ol.View.Hint.INTERACTING, 1); } map.render(); if (this.kineticPreRenderFn_ && diff --git a/src/ol/interaction/dragrotate.js b/src/ol/interaction/dragrotate.js index 3d3a85833f..487492e6de 100644 --- a/src/ol/interaction/dragrotate.js +++ b/src/ol/interaction/dragrotate.js @@ -1,9 +1,9 @@ goog.provide('ol.interaction.DragRotate'); goog.require('ol'); -goog.require('ol.ViewHint'); -goog.require('ol.functions'); +goog.require('ol.View'); goog.require('ol.events.condition'); +goog.require('ol.functions'); goog.require('ol.interaction.Interaction'); goog.require('ol.interaction.Pointer'); @@ -93,7 +93,7 @@ ol.interaction.DragRotate.handleUpEvent_ = function(mapBrowserEvent) { var map = mapBrowserEvent.map; var view = map.getView(); - view.setHint(ol.ViewHint.INTERACTING, -1); + view.setHint(ol.View.Hint.INTERACTING, -1); var rotation = view.getRotation(); ol.interaction.Interaction.rotate(map, view, rotation, undefined, this.duration_); @@ -115,7 +115,7 @@ ol.interaction.DragRotate.handleDownEvent_ = function(mapBrowserEvent) { if (ol.events.condition.mouseActionButton(mapBrowserEvent) && this.condition_(mapBrowserEvent)) { var map = mapBrowserEvent.map; - map.getView().setHint(ol.ViewHint.INTERACTING, 1); + map.getView().setHint(ol.View.Hint.INTERACTING, 1); map.render(); this.lastAngle_ = undefined; return true; diff --git a/src/ol/interaction/dragrotateandzoom.js b/src/ol/interaction/dragrotateandzoom.js index 8917568133..07ed84e985 100644 --- a/src/ol/interaction/dragrotateandzoom.js +++ b/src/ol/interaction/dragrotateandzoom.js @@ -1,7 +1,7 @@ goog.provide('ol.interaction.DragRotateAndZoom'); goog.require('ol'); -goog.require('ol.ViewHint'); +goog.require('ol.View'); goog.require('ol.events.condition'); goog.require('ol.interaction.Interaction'); goog.require('ol.interaction.Pointer'); @@ -116,7 +116,7 @@ ol.interaction.DragRotateAndZoom.handleUpEvent_ = function(mapBrowserEvent) { var map = mapBrowserEvent.map; var view = map.getView(); - view.setHint(ol.ViewHint.INTERACTING, -1); + view.setHint(ol.View.Hint.INTERACTING, -1); var direction = this.lastScaleDelta_ - 1; ol.interaction.Interaction.rotate(map, view, view.getRotation()); ol.interaction.Interaction.zoom(map, view, view.getResolution(), @@ -138,7 +138,7 @@ ol.interaction.DragRotateAndZoom.handleDownEvent_ = function(mapBrowserEvent) { } if (this.condition_(mapBrowserEvent)) { - mapBrowserEvent.map.getView().setHint(ol.ViewHint.INTERACTING, 1); + mapBrowserEvent.map.getView().setHint(ol.View.Hint.INTERACTING, 1); this.lastAngle_ = undefined; this.lastMagnitude_ = undefined; return true; diff --git a/src/ol/interaction/modify.js b/src/ol/interaction/modify.js index 2c1e15251f..fcc9d4f07c 100644 --- a/src/ol/interaction/modify.js +++ b/src/ol/interaction/modify.js @@ -1,17 +1,17 @@ goog.provide('ol.interaction.Modify'); goog.provide('ol.interaction.ModifyEvent'); -goog.require('ol.events'); -goog.require('ol.events.Event'); -goog.require('ol.events.EventType'); goog.require('ol'); goog.require('ol.Collection'); goog.require('ol.Feature'); goog.require('ol.MapBrowserEvent.EventType'); goog.require('ol.MapBrowserPointerEvent'); -goog.require('ol.ViewHint'); +goog.require('ol.View'); goog.require('ol.array'); goog.require('ol.coordinate'); +goog.require('ol.events'); +goog.require('ol.events.Event'); +goog.require('ol.events.EventType'); goog.require('ol.events.condition'); goog.require('ol.extent'); goog.require('ol.geom.GeometryType'); @@ -696,7 +696,7 @@ ol.interaction.Modify.handleEvent = function(mapBrowserEvent) { this.lastPointerEvent_ = mapBrowserEvent; var handled; - if (!mapBrowserEvent.map.getView().getHints()[ol.ViewHint.INTERACTING] && + if (!mapBrowserEvent.map.getView().getHints()[ol.View.Hint.INTERACTING] && mapBrowserEvent.type == ol.MapBrowserEvent.EventType.POINTERMOVE && !this.handlingDownUpSequence) { this.handlePointerMove_(mapBrowserEvent); diff --git a/src/ol/interaction/pinchrotate.js b/src/ol/interaction/pinchrotate.js index 21ce53fe22..5b6e125510 100644 --- a/src/ol/interaction/pinchrotate.js +++ b/src/ol/interaction/pinchrotate.js @@ -1,8 +1,8 @@ goog.provide('ol.interaction.PinchRotate'); goog.require('ol'); +goog.require('ol.View'); goog.require('ol.functions'); -goog.require('ol.ViewHint'); goog.require('ol.interaction.Interaction'); goog.require('ol.interaction.Pointer'); @@ -128,7 +128,7 @@ ol.interaction.PinchRotate.handleUpEvent_ = function(mapBrowserEvent) { if (this.targetPointers.length < 2) { var map = mapBrowserEvent.map; var view = map.getView(); - view.setHint(ol.ViewHint.INTERACTING, -1); + view.setHint(ol.View.Hint.INTERACTING, -1); if (this.rotating_) { var rotation = view.getRotation(); ol.interaction.Interaction.rotate( @@ -155,7 +155,7 @@ ol.interaction.PinchRotate.handleDownEvent_ = function(mapBrowserEvent) { this.rotating_ = false; this.rotationDelta_ = 0.0; if (!this.handlingDownUpSequence) { - map.getView().setHint(ol.ViewHint.INTERACTING, 1); + map.getView().setHint(ol.View.Hint.INTERACTING, 1); } map.render(); return true; diff --git a/src/ol/interaction/pinchzoom.js b/src/ol/interaction/pinchzoom.js index f101fea0b7..5497cf78ef 100644 --- a/src/ol/interaction/pinchzoom.js +++ b/src/ol/interaction/pinchzoom.js @@ -1,8 +1,8 @@ goog.provide('ol.interaction.PinchZoom'); goog.require('ol'); +goog.require('ol.View'); goog.require('ol.functions'); -goog.require('ol.ViewHint'); goog.require('ol.interaction.Interaction'); goog.require('ol.interaction.Pointer'); @@ -110,7 +110,7 @@ ol.interaction.PinchZoom.handleUpEvent_ = function(mapBrowserEvent) { if (this.targetPointers.length < 2) { var map = mapBrowserEvent.map; var view = map.getView(); - view.setHint(ol.ViewHint.INTERACTING, -1); + view.setHint(ol.View.Hint.INTERACTING, -1); var resolution = view.getResolution(); // Zoom to final resolution, with an animation, and provide a // direction not to zoom out/in if user was pinching in/out. @@ -138,7 +138,7 @@ ol.interaction.PinchZoom.handleDownEvent_ = function(mapBrowserEvent) { this.lastDistance_ = undefined; this.lastScaleDelta_ = 1; if (!this.handlingDownUpSequence) { - map.getView().setHint(ol.ViewHint.INTERACTING, 1); + map.getView().setHint(ol.View.Hint.INTERACTING, 1); } map.render(); return true; diff --git a/src/ol/map.js b/src/ol/map.js index 441c632ff7..217abcfb28 100644 --- a/src/ol/map.js +++ b/src/ol/map.js @@ -17,7 +17,6 @@ goog.require('ol.ObjectEventType'); goog.require('ol.RendererType'); goog.require('ol.TileQueue'); goog.require('ol.View'); -goog.require('ol.ViewHint'); goog.require('ol.array'); goog.require('ol.control'); goog.require('ol.dom'); @@ -29,7 +28,6 @@ goog.require('ol.functions'); goog.require('ol.has'); goog.require('ol.interaction'); goog.require('ol.layer.Group'); -goog.require('ol.transform'); goog.require('ol.obj'); goog.require('ol.proj.common'); goog.require('ol.renderer.Map'); @@ -38,6 +36,7 @@ goog.require('ol.renderer.dom.Map'); goog.require('ol.renderer.webgl.Map'); goog.require('ol.size'); goog.require('ol.structs.PriorityQueue'); +goog.require('ol.transform'); /** @@ -1002,11 +1001,11 @@ ol.Map.prototype.handlePostRender = function() { var maxNewLoads = maxTotalLoading; if (frameState) { var hints = frameState.viewHints; - if (hints[ol.ViewHint.ANIMATING]) { + if (hints[ol.View.Hint.ANIMATING]) { maxTotalLoading = this.loadTilesWhileAnimating_ ? 8 : 0; maxNewLoads = 2; } - if (hints[ol.ViewHint.INTERACTING]) { + if (hints[ol.View.Hint.INTERACTING]) { maxTotalLoading = this.loadTilesWhileInteracting_ ? 8 : 0; maxNewLoads = 2; } @@ -1298,8 +1297,8 @@ ol.Map.prototype.renderFrame_ = function(time) { this.postRenderFunctions_, frameState.postRenderFunctions); var idle = this.preRenderFunctions_.length === 0 && - !frameState.viewHints[ol.ViewHint.ANIMATING] && - !frameState.viewHints[ol.ViewHint.INTERACTING] && + !frameState.viewHints[ol.View.Hint.ANIMATING] && + !frameState.viewHints[ol.View.Hint.INTERACTING] && !ol.extent.equals(frameState.extent, this.previousExtent_); if (idle) { diff --git a/src/ol/renderer/canvas/imagelayer.js b/src/ol/renderer/canvas/imagelayer.js index e09d713dfe..fe9f3b5338 100644 --- a/src/ol/renderer/canvas/imagelayer.js +++ b/src/ol/renderer/canvas/imagelayer.js @@ -1,13 +1,13 @@ goog.provide('ol.renderer.canvas.ImageLayer'); -goog.require('ol.transform'); -goog.require('ol.functions'); -goog.require('ol.ViewHint'); +goog.require('ol.View'); goog.require('ol.dom'); goog.require('ol.extent'); +goog.require('ol.functions'); goog.require('ol.proj'); goog.require('ol.renderer.canvas.Layer'); goog.require('ol.source.ImageVector'); +goog.require('ol.transform'); /** @@ -154,7 +154,7 @@ ol.renderer.canvas.ImageLayer.prototype.prepareFrame = function(frameState, laye renderedExtent, layerState.extent); } - if (!hints[ol.ViewHint.ANIMATING] && !hints[ol.ViewHint.INTERACTING] && + if (!hints[ol.View.Hint.ANIMATING] && !hints[ol.View.Hint.INTERACTING] && !ol.extent.isEmpty(renderedExtent)) { var projection = viewState.projection; if (!ol.ENABLE_RASTER_REPROJECTION) { diff --git a/src/ol/renderer/canvas/vectorlayer.js b/src/ol/renderer/canvas/vectorlayer.js index 92287cc9b5..dd62d2a9e5 100644 --- a/src/ol/renderer/canvas/vectorlayer.js +++ b/src/ol/renderer/canvas/vectorlayer.js @@ -1,6 +1,6 @@ goog.provide('ol.renderer.canvas.VectorLayer'); -goog.require('ol.ViewHint'); +goog.require('ol.View'); goog.require('ol.dom'); goog.require('ol.extent'); goog.require('ol.render.EventType'); @@ -201,8 +201,8 @@ ol.renderer.canvas.VectorLayer.prototype.prepareFrame = function(frameState, lay frameState.attributions, vectorSource.getAttributions()); this.updateLogos(frameState, vectorSource); - var animating = frameState.viewHints[ol.ViewHint.ANIMATING]; - var interacting = frameState.viewHints[ol.ViewHint.INTERACTING]; + var animating = frameState.viewHints[ol.View.Hint.ANIMATING]; + var interacting = frameState.viewHints[ol.View.Hint.INTERACTING]; var updateWhileAnimating = vectorLayer.getUpdateWhileAnimating(); var updateWhileInteracting = vectorLayer.getUpdateWhileInteracting(); diff --git a/src/ol/renderer/dom/imagelayer.js b/src/ol/renderer/dom/imagelayer.js index 6a2315292f..63f8dcdc9c 100644 --- a/src/ol/renderer/dom/imagelayer.js +++ b/src/ol/renderer/dom/imagelayer.js @@ -1,11 +1,11 @@ goog.provide('ol.renderer.dom.ImageLayer'); -goog.require('ol.transform'); -goog.require('ol.ViewHint'); +goog.require('ol.View'); goog.require('ol.dom'); goog.require('ol.extent'); goog.require('ol.proj'); goog.require('ol.renderer.dom.Layer'); +goog.require('ol.transform'); /** @@ -88,7 +88,7 @@ ol.renderer.dom.ImageLayer.prototype.prepareFrame = function(frameState, layerSt renderedExtent, layerState.extent); } - if (!hints[ol.ViewHint.ANIMATING] && !hints[ol.ViewHint.INTERACTING] && + if (!hints[ol.View.Hint.ANIMATING] && !hints[ol.View.Hint.INTERACTING] && !ol.extent.isEmpty(renderedExtent)) { var projection = viewState.projection; if (!ol.ENABLE_RASTER_REPROJECTION) { diff --git a/src/ol/renderer/dom/tilelayer.js b/src/ol/renderer/dom/tilelayer.js index 81a26aa59c..6633b91e0d 100644 --- a/src/ol/renderer/dom/tilelayer.js +++ b/src/ol/renderer/dom/tilelayer.js @@ -3,16 +3,16 @@ goog.provide('ol.renderer.dom.TileLayer'); -goog.require('ol.transform'); goog.require('ol'); -goog.require('ol.TileRange'); goog.require('ol.Tile'); -goog.require('ol.ViewHint'); +goog.require('ol.TileRange'); +goog.require('ol.View'); goog.require('ol.array'); goog.require('ol.dom'); goog.require('ol.extent'); goog.require('ol.renderer.dom.Layer'); goog.require('ol.size'); +goog.require('ol.transform'); /** @@ -225,8 +225,8 @@ ol.renderer.dom.TileLayer.prototype.prepareFrame = function(frameState, layerSta this.target.insertBefore(tileLayerZ.target, this.target.childNodes[0] || null); } } else { - if (!frameState.viewHints[ol.ViewHint.ANIMATING] && - !frameState.viewHints[ol.ViewHint.INTERACTING]) { + if (!frameState.viewHints[ol.View.Hint.ANIMATING] && + !frameState.viewHints[ol.View.Hint.INTERACTING]) { tileLayerZ.removeTilesOutsideExtent(extent, tmpTileRange); } } diff --git a/src/ol/renderer/dom/vectorlayer.js b/src/ol/renderer/dom/vectorlayer.js index 1f0e2e4152..7f2b4f5102 100644 --- a/src/ol/renderer/dom/vectorlayer.js +++ b/src/ol/renderer/dom/vectorlayer.js @@ -1,7 +1,7 @@ goog.provide('ol.renderer.dom.VectorLayer'); goog.require('ol.transform'); -goog.require('ol.ViewHint'); +goog.require('ol.View.Hint'); goog.require('ol.dom'); goog.require('ol.extent'); goog.require('ol.render.Event'); @@ -217,8 +217,8 @@ ol.renderer.dom.VectorLayer.prototype.prepareFrame = function(frameState, layerS frameState.attributions, vectorSource.getAttributions()); this.updateLogos(frameState, vectorSource); - var animating = frameState.viewHints[ol.ViewHint.ANIMATING]; - var interacting = frameState.viewHints[ol.ViewHint.INTERACTING]; + var animating = frameState.viewHints[ol.View.Hint.ANIMATING]; + var interacting = frameState.viewHints[ol.View.Hint.INTERACTING]; var updateWhileAnimating = vectorLayer.getUpdateWhileAnimating(); var updateWhileInteracting = vectorLayer.getUpdateWhileInteracting(); diff --git a/src/ol/renderer/webgl/imagelayer.js b/src/ol/renderer/webgl/imagelayer.js index 5cfcdaad3b..3c55792ad2 100644 --- a/src/ol/renderer/webgl/imagelayer.js +++ b/src/ol/renderer/webgl/imagelayer.js @@ -1,13 +1,13 @@ goog.provide('ol.renderer.webgl.ImageLayer'); -goog.require('ol.transform'); -goog.require('ol.ViewHint'); +goog.require('ol.View'); goog.require('ol.dom'); goog.require('ol.extent'); goog.require('ol.functions'); goog.require('ol.proj'); goog.require('ol.renderer.webgl.Layer'); goog.require('ol.source.ImageVector'); +goog.require('ol.transform'); goog.require('ol.webgl'); goog.require('ol.webgl.Context'); @@ -111,7 +111,7 @@ ol.renderer.webgl.ImageLayer.prototype.prepareFrame = function(frameState, layer renderedExtent = ol.extent.getIntersection( renderedExtent, layerState.extent); } - if (!hints[ol.ViewHint.ANIMATING] && !hints[ol.ViewHint.INTERACTING] && + if (!hints[ol.View.Hint.ANIMATING] && !hints[ol.View.Hint.INTERACTING] && !ol.extent.isEmpty(renderedExtent)) { var projection = viewState.projection; if (!ol.ENABLE_RASTER_REPROJECTION) { diff --git a/src/ol/renderer/webgl/vectorlayer.js b/src/ol/renderer/webgl/vectorlayer.js index 82061f115a..0af0460772 100644 --- a/src/ol/renderer/webgl/vectorlayer.js +++ b/src/ol/renderer/webgl/vectorlayer.js @@ -1,11 +1,11 @@ goog.provide('ol.renderer.webgl.VectorLayer'); -goog.require('ol.ViewHint'); +goog.require('ol.View'); goog.require('ol.extent'); -goog.require('ol.transform'); goog.require('ol.render.webgl.ReplayGroup'); goog.require('ol.renderer.vector'); goog.require('ol.renderer.webgl.Layer'); +goog.require('ol.transform'); /** @@ -184,8 +184,8 @@ ol.renderer.webgl.VectorLayer.prototype.prepareFrame = function(frameState, laye frameState.attributions, vectorSource.getAttributions()); this.updateLogos(frameState, vectorSource); - var animating = frameState.viewHints[ol.ViewHint.ANIMATING]; - var interacting = frameState.viewHints[ol.ViewHint.INTERACTING]; + var animating = frameState.viewHints[ol.View.Hint.ANIMATING]; + var interacting = frameState.viewHints[ol.View.Hint.INTERACTING]; var updateWhileAnimating = vectorLayer.getUpdateWhileAnimating(); var updateWhileInteracting = vectorLayer.getUpdateWhileInteracting(); diff --git a/src/ol/view.js b/src/ol/view.js index 1185671de9..d8ce577c16 100644 --- a/src/ol/view.js +++ b/src/ol/view.js @@ -1,6 +1,4 @@ goog.provide('ol.View'); -goog.provide('ol.ViewHint'); -goog.provide('ol.ViewProperty'); goog.require('ol'); goog.require('ol.CenterConstraint'); @@ -19,25 +17,6 @@ goog.require('ol.proj.METERS_PER_UNIT'); goog.require('ol.proj.Units'); -/** - * @enum {string} - */ -ol.ViewProperty = { - CENTER: 'center', - RESOLUTION: 'resolution', - ROTATION: 'rotation' -}; - - -/** - * @enum {number} - */ -ol.ViewHint = { - ANIMATING: 0, - INTERACTING: 1 -}; - - /** * @classdesc * An ol.View object represents a simple 2D view of the map. @@ -109,7 +88,7 @@ ol.View = function(opt_options) { * @type {Object.} */ var properties = {}; - properties[ol.ViewProperty.CENTER] = options.center !== undefined ? + properties[ol.View.Property.CENTER] = options.center !== undefined ? options.center : null; /** @@ -164,12 +143,12 @@ ol.View = function(opt_options) { centerConstraint, resolutionConstraint, rotationConstraint); if (options.resolution !== undefined) { - properties[ol.ViewProperty.RESOLUTION] = options.resolution; + properties[ol.View.Property.RESOLUTION] = options.resolution; } else if (options.zoom !== undefined) { - properties[ol.ViewProperty.RESOLUTION] = this.constrainResolution( + properties[ol.View.Property.RESOLUTION] = this.constrainResolution( this.maxResolution_, options.zoom - this.minZoom_); } - properties[ol.ViewProperty.ROTATION] = + properties[ol.View.Property.ROTATION] = options.rotation !== undefined ? options.rotation : 0; this.setProperties(properties); }; @@ -261,7 +240,7 @@ ol.View.prototype.constrainRotation = function(rotation, opt_delta) { */ ol.View.prototype.getCenter = function() { return /** @type {ol.Coordinate|undefined} */ ( - this.get(ol.ViewProperty.CENTER)); + this.get(ol.View.Property.CENTER)); }; @@ -339,7 +318,7 @@ ol.View.prototype.getProjection = function() { */ ol.View.prototype.getResolution = function() { return /** @type {number|undefined} */ ( - this.get(ol.ViewProperty.RESOLUTION)); + this.get(ol.View.Property.RESOLUTION)); }; @@ -402,7 +381,7 @@ ol.View.prototype.getResolutionForValueFunction = function(opt_power) { * @api stable */ ol.View.prototype.getRotation = function() { - return /** @type {number} */ (this.get(ol.ViewProperty.ROTATION)); + return /** @type {number} */ (this.get(ol.View.Property.ROTATION)); }; @@ -623,12 +602,12 @@ ol.View.prototype.rotate = function(rotation, opt_anchor) { * @api stable */ ol.View.prototype.setCenter = function(center) { - this.set(ol.ViewProperty.CENTER, center); + this.set(ol.View.Property.CENTER, center); }; /** - * @param {ol.ViewHint} hint Hint. + * @param {ol.View.Hint} hint Hint. * @param {number} delta Delta. * @return {number} New value. */ @@ -649,7 +628,7 @@ ol.View.prototype.setHint = function(hint, delta) { * @api stable */ ol.View.prototype.setResolution = function(resolution) { - this.set(ol.ViewProperty.RESOLUTION, resolution); + this.set(ol.View.Property.RESOLUTION, resolution); }; @@ -660,7 +639,7 @@ ol.View.prototype.setResolution = function(resolution) { * @api stable */ ol.View.prototype.setRotation = function(rotation) { - this.set(ol.ViewProperty.ROTATION, rotation); + this.set(ol.View.Property.ROTATION, rotation); }; @@ -797,3 +776,22 @@ ol.View.createRotationConstraint_ = function(options) { return ol.RotationConstraint.disable; } }; + + +/** + * @enum {string} + */ +ol.View.Property = { + CENTER: 'center', + RESOLUTION: 'resolution', + ROTATION: 'rotation' +}; + + +/** + * @enum {number} + */ +ol.View.Hint = { + ANIMATING: 0, + INTERACTING: 1 +};