Rename _ol_geom_Point_ to Point

This commit is contained in:
Tim Schaub
2017-12-14 08:49:10 -07:00
parent 75c5a8b246
commit eadec38ae2
76 changed files with 365 additions and 365 deletions

View File

@@ -1,7 +1,7 @@
import _ol_Feature_ from '../src/ol/Feature.js';
import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.js';
import _ol_geom_Point_ from '../src/ol/geom/Point.js';
import Point from '../src/ol/geom/Point.js';
import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js';
import _ol_style_Circle_ from '../src/ol/style/Circle.js';
@@ -16,7 +16,7 @@ import _ol_style_Style_ from '../src/ol/style/Style.js';
// features form the corners of an equilateral triangle and their styles overlap
var redLayer = new _ol_layer_Vector_({
source: new _ol_source_Vector_({
features: [new _ol_Feature_(new _ol_geom_Point_([0, 0]))]
features: [new _ol_Feature_(new Point([0, 0]))]
}),
style: new _ol_style_Style_({
image: new _ol_style_Circle_({
@@ -34,7 +34,7 @@ var redLayer = new _ol_layer_Vector_({
var greenLayer = new _ol_layer_Vector_({
source: new _ol_source_Vector_({
// 433.013 is roughly 250 * Math.sqrt(3)
features: [new _ol_Feature_(new _ol_geom_Point_([250, 433.013]))]
features: [new _ol_Feature_(new Point([250, 433.013]))]
}),
style: new _ol_style_Style_({
image: new _ol_style_Circle_({
@@ -51,7 +51,7 @@ var greenLayer = new _ol_layer_Vector_({
});
var blueLayer = new _ol_layer_Vector_({
source: new _ol_source_Vector_({
features: [new _ol_Feature_(new _ol_geom_Point_([500, 0]))]
features: [new _ol_Feature_(new Point([500, 0]))]
}),
style: new _ol_style_Style_({
image: new _ol_style_Circle_({

View File

@@ -1,7 +1,7 @@
import _ol_Feature_ from '../src/ol/Feature.js';
import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.js';
import _ol_geom_Point_ from '../src/ol/geom/Point.js';
import Point from '../src/ol/geom/Point.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
import _ol_source_Cluster_ from '../src/ol/source/Cluster.js';
@@ -21,7 +21,7 @@ var features = new Array(count);
var e = 4500000;
for (var i = 0; i < count; ++i) {
var coordinates = [2 * e * Math.random() - e, 2 * e * Math.random() - e];
features[i] = new _ol_Feature_(new _ol_geom_Point_(coordinates));
features[i] = new _ol_Feature_(new Point(coordinates));
}
var source = new _ol_source_Vector_({

View File

@@ -3,7 +3,7 @@ import _ol_Feature_ from '../src/ol/Feature.js';
import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.js';
import _ol_geom_LineString_ from '../src/ol/geom/LineString.js';
import _ol_geom_Point_ from '../src/ol/geom/Point.js';
import Point from '../src/ol/geom/Point.js';
import _ol_geom_Polygon_ from '../src/ol/geom/Polygon.js';
import _ol_interaction_ from '../src/ol/interaction.js';
import _ol_interaction_Pointer_ from '../src/ol/interaction/Pointer.js';
@@ -134,7 +134,7 @@ app.Drag.prototype.handleUpEvent = function() {
};
var pointFeature = new _ol_Feature_(new _ol_geom_Point_([0, 0]));
var pointFeature = new _ol_Feature_(new Point([0, 0]));
var lineFeature = new _ol_Feature_(
new _ol_geom_LineString_([[-1e7, 1e6], [-1e6, 3e6]]));

View File

@@ -1,7 +1,7 @@
import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.js';
import _ol_geom_MultiPoint_ from '../src/ol/geom/MultiPoint.js';
import _ol_geom_Point_ from '../src/ol/geom/Point.js';
import Point from '../src/ol/geom/Point.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js';
import _ol_style_Circle_ from '../src/ol/style/Circle.js';
@@ -68,7 +68,7 @@ map.on('postcompose', function(event) {
vectorContext.setStyle(imageStyle);
vectorContext.drawGeometry(new _ol_geom_MultiPoint_(coordinates));
var headPoint = new _ol_geom_Point_(coordinates[coordinates.length - 1]);
var headPoint = new Point(coordinates[coordinates.length - 1]);
vectorContext.setStyle(headOuterImageStyle);
vectorContext.drawGeometry(headPoint);

View File

@@ -4,7 +4,7 @@ import _ol_Observable_ from '../src/ol/Observable.js';
import _ol_View_ from '../src/ol/View.js';
import _ol_control_ from '../src/ol/control.js';
import {easeOut} from '../src/ol/easing.js';
import _ol_geom_Point_ from '../src/ol/geom/Point.js';
import Point from '../src/ol/geom/Point.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
import {fromLonLat} from '../src/ol/proj.js';
@@ -46,7 +46,7 @@ map.addLayer(vector);
function addRandomFeature() {
var x = Math.random() * 360 - 180;
var y = Math.random() * 180 - 90;
var geom = new _ol_geom_Point_(fromLonLat([x, y]));
var geom = new Point(fromLonLat([x, y]));
var feature = new _ol_Feature_(geom);
source.addFeature(feature);
}

View File

@@ -2,7 +2,7 @@ import _ol_Feature_ from '../src/ol/Feature.js';
import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.js';
import _ol_format_Polyline_ from '../src/ol/format/Polyline.js';
import _ol_geom_Point_ from '../src/ol/geom/Point.js';
import Point from '../src/ol/geom/Point.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
@@ -73,15 +73,15 @@ var routeFeature = new _ol_Feature_({
});
var geoMarker = new _ol_Feature_({
type: 'geoMarker',
geometry: new _ol_geom_Point_(routeCoords[0])
geometry: new Point(routeCoords[0])
});
var startMarker = new _ol_Feature_({
type: 'icon',
geometry: new _ol_geom_Point_(routeCoords[0])
geometry: new Point(routeCoords[0])
});
var endMarker = new _ol_Feature_({
type: 'icon',
geometry: new _ol_geom_Point_(routeCoords[routeLength - 1])
geometry: new Point(routeCoords[routeLength - 1])
});
var styles = {
@@ -162,7 +162,7 @@ var moveFeature = function(event) {
return;
}
var currentPoint = new _ol_geom_Point_(routeCoords[index]);
var currentPoint = new Point(routeCoords[index]);
var feature = new _ol_Feature_(currentPoint);
vectorContext.drawFeature(feature, styles.geoMarker);
}

View File

@@ -3,7 +3,7 @@ import _ol_Geolocation_ from '../src/ol/Geolocation.js';
import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.js';
import _ol_control_ from '../src/ol/control.js';
import _ol_geom_Point_ from '../src/ol/geom/Point.js';
import Point from '../src/ol/geom/Point.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js';
@@ -83,7 +83,7 @@ positionFeature.setStyle(new _ol_style_Style_({
geolocation.on('change:position', function() {
var coordinates = geolocation.getPosition();
positionFeature.setGeometry(coordinates ?
new _ol_geom_Point_(coordinates) : null);
new Point(coordinates) : null);
});
new _ol_layer_Vector_({

View File

@@ -1,7 +1,7 @@
import _ol_Feature_ from '../src/ol/Feature.js';
import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.js';
import _ol_geom_Point_ from '../src/ol/geom/Point.js';
import Point from '../src/ol/geom/Point.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
import {fromLonLat} from '../src/ol/proj.js';
@@ -12,15 +12,15 @@ import _ol_style_Style_ from '../src/ol/style/Style.js';
var rome = new _ol_Feature_({
geometry: new _ol_geom_Point_(fromLonLat([12.5, 41.9]))
geometry: new Point(fromLonLat([12.5, 41.9]))
});
var london = new _ol_Feature_({
geometry: new _ol_geom_Point_(fromLonLat([-0.12755, 51.507222]))
geometry: new Point(fromLonLat([-0.12755, 51.507222]))
});
var madrid = new _ol_Feature_({
geometry: new _ol_geom_Point_(fromLonLat([-3.683333, 40.4]))
geometry: new Point(fromLonLat([-3.683333, 40.4]))
});
rome.setStyle(new _ol_style_Style_({

View File

@@ -1,7 +1,7 @@
import _ol_Feature_ from '../src/ol/Feature.js';
import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.js';
import _ol_geom_Point_ from '../src/ol/geom/Point.js';
import Point from '../src/ol/geom/Point.js';
import _ol_interaction_Select_ from '../src/ol/interaction/Select.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
@@ -23,7 +23,7 @@ function createStyle(src, img) {
});
}
var iconFeature = new _ol_Feature_(new _ol_geom_Point_([0, 0]));
var iconFeature = new _ol_Feature_(new Point([0, 0]));
iconFeature.set('style', createStyle('data/icon.png', undefined));
var map = new _ol_Map_({

View File

@@ -1,7 +1,7 @@
import _ol_Feature_ from '../src/ol/Feature.js';
import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.js';
import _ol_geom_Point_ from '../src/ol/geom/Point.js';
import Point from '../src/ol/geom/Point.js';
import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js';
import _ol_style_Icon_ from '../src/ol/style/Icon.js';
@@ -61,7 +61,7 @@ var features = new Array(featureCount);
var feature, geometry;
var e = 25000000;
for (i = 0; i < featureCount; ++i) {
geometry = new _ol_geom_Point_(
geometry = new Point(
[2 * e * Math.random() - e, 2 * e * Math.random() - e]);
feature = new _ol_Feature_(geometry);
feature.setStyle(

View File

@@ -2,7 +2,7 @@ import _ol_Feature_ from '../src/ol/Feature.js';
import _ol_Map_ from '../src/ol/Map.js';
import _ol_Overlay_ from '../src/ol/Overlay.js';
import _ol_View_ from '../src/ol/View.js';
import _ol_geom_Point_ from '../src/ol/geom/Point.js';
import Point from '../src/ol/geom/Point.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
import _ol_source_TileJSON_ from '../src/ol/source/TileJSON.js';
@@ -12,7 +12,7 @@ import _ol_style_Style_ from '../src/ol/style/Style.js';
var iconFeature = new _ol_Feature_({
geometry: new _ol_geom_Point_([0, 0]),
geometry: new Point([0, 0]),
name: 'Null Island',
population: 4000,
rainfall: 500

View File

@@ -4,7 +4,7 @@ import _ol_View_ from '../src/ol/View.js';
import _ol_control_ from '../src/ol/control.js';
import _ol_format_IGC_ from '../src/ol/format/IGC.js';
import _ol_geom_LineString_ from '../src/ol/geom/LineString.js';
import _ol_geom_Point_ from '../src/ol/geom/Point.js';
import Point from '../src/ol/geom/Point.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js';
@@ -123,7 +123,7 @@ var displaySnap = function(coordinate) {
var geometry = closestFeature.getGeometry();
var closestPoint = geometry.getClosestPoint(coordinate);
if (point === null) {
point = new _ol_geom_Point_(closestPoint);
point = new Point(closestPoint);
} else {
point.setCoordinates(closestPoint);
}
@@ -196,7 +196,7 @@ document.getElementById('time').addEventListener('input', function() {
var coordinate = geometry.getCoordinateAtM(m, true);
var highlight = feature.get('highlight');
if (highlight === undefined) {
highlight = new _ol_Feature_(new _ol_geom_Point_(coordinate));
highlight = new _ol_Feature_(new Point(coordinate));
feature.set('highlight', highlight);
featureOverlay.getSource().addFeature(highlight);
} else {

View File

@@ -1,7 +1,7 @@
import _ol_Feature_ from '../src/ol/Feature.js';
import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.js';
import _ol_geom_Point_ from '../src/ol/geom/Point.js';
import Point from '../src/ol/geom/Point.js';
import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js';
@@ -46,7 +46,7 @@ var styles = {
function createLayer(coordinates, style, zIndex) {
var feature = new _ol_Feature_(new _ol_geom_Point_(coordinates));
var feature = new _ol_Feature_(new Point(coordinates));
feature.setStyle(style);
var source = new _ol_source_Vector_({

View File

@@ -1,6 +1,6 @@
import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.js';
import _ol_geom_Point_ from '../src/ol/geom/Point.js';
import Point from '../src/ol/geom/Point.js';
import _ol_interaction_Draw_ from '../src/ol/interaction/Draw.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
@@ -34,7 +34,7 @@ var styleFunction = function(feature) {
var rotation = Math.atan2(dy, dx);
// arrows
styles.push(new _ol_style_Style_({
geometry: new _ol_geom_Point_(end),
geometry: new Point(end),
image: new _ol_style_Icon_({
src: 'data/arrow.png',
anchor: [0.75, 0.5],

View File

@@ -1,7 +1,7 @@
import _ol_Feature_ from '../src/ol/Feature.js';
import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.js';
import _ol_geom_Point_ from '../src/ol/geom/Point.js';
import Point from '../src/ol/geom/Point.js';
import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js';
@@ -72,7 +72,7 @@ var features = new Array(count);
var e = 4500000;
for (var i = 0; i < count; ++i) {
var coordinates = [2 * e * Math.random() - e, 2 * e * Math.random() - e];
features[i] = new _ol_Feature_(new _ol_geom_Point_(coordinates));
features[i] = new _ol_Feature_(new Point(coordinates));
features[i].setStyle(styles[styleKeys[Math.floor(Math.random() * 5)]]);
}

View File

@@ -1,5 +1,5 @@
import _ol_geom_LineString_ from '../src/ol/geom/LineString.js';
import _ol_geom_Point_ from '../src/ol/geom/Point.js';
import Point from '../src/ol/geom/Point.js';
import _ol_geom_Polygon_ from '../src/ol/geom/Polygon.js';
import _ol_render_ from '../src/ol/render.js';
import _ol_style_Circle_ from '../src/ol/style/Circle.js';
@@ -26,4 +26,4 @@ vectorContext.setStyle(style);
vectorContext.drawGeometry(new _ol_geom_LineString_([[10, 10], [90, 90]]));
vectorContext.drawGeometry(new _ol_geom_Polygon_([[[2, 2], [98, 2], [2, 98], [2, 2]]]));
vectorContext.drawGeometry(new _ol_geom_Point_([88, 88]));
vectorContext.drawGeometry(new Point([88, 88]));

View File

@@ -1,7 +1,7 @@
import _ol_Feature_ from '../src/ol/Feature.js';
import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.js';
import _ol_geom_Point_ from '../src/ol/geom/Point.js';
import Point from '../src/ol/geom/Point.js';
import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js';
import _ol_style_AtlasManager_ from '../src/ol/style/AtlasManager.js';
@@ -88,7 +88,7 @@ var features = new Array(featureCount);
var feature, geometry;
var e = 25000000;
for (i = 0; i < featureCount; ++i) {
geometry = new _ol_geom_Point_(
geometry = new Point(
[2 * e * Math.random() - e, 2 * e * Math.random() - e]);
feature = new _ol_Feature_(geometry);
feature.setStyle(

View File

@@ -2,7 +2,7 @@ import _ol_Feature_ from '../src/ol/Feature.js';
import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.js';
import _ol_geom_LineString_ from '../src/ol/geom/LineString.js';
import _ol_geom_Point_ from '../src/ol/geom/Point.js';
import Point from '../src/ol/geom/Point.js';
import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
import _ol_source_Vector_ from '../src/ol/source/Vector.js';
import _ol_style_Circle_ from '../src/ol/style/Circle.js';
@@ -16,7 +16,7 @@ var features = new Array(count);
var e = 18000000;
for (var i = 0; i < count; ++i) {
features[i] = new _ol_Feature_({
'geometry': new _ol_geom_Point_(
'geometry': new Point(
[2 * e * Math.random() - e, 2 * e * Math.random() - e]),
'i': i,
'size': i % 2 ? 10 : 20
@@ -71,7 +71,7 @@ var displaySnap = function(coordinate) {
var geometry = closestFeature.getGeometry();
var closestPoint = geometry.getClosestPoint(coordinate);
if (point === null) {
point = new _ol_geom_Point_(closestPoint);
point = new Point(closestPoint);
} else {
point.setCoordinates(closestPoint);
}

View File

@@ -4,7 +4,7 @@
import _ol_Feature_ from '../src/ol/Feature.js';
import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.js';
import _ol_geom_Point_ from '../src/ol/geom/Point.js';
import Point from '../src/ol/geom/Point.js';
import _ol_geom_LineString_ from '../src/ol/geom/LineString.js';
import _ol_geom_Polygon_ from '../src/ol/geom/Polygon.js';
import _ol_interaction_Draw_ from '../src/ol/interaction/Draw.js';
@@ -130,7 +130,7 @@ function removeElementFeature(source, element) {
function nodeToFeature(node) {
var feature = new _ol_Feature_({
geometry: new _ol_geom_Point_(node.coordinate),
geometry: new Point(node.coordinate),
node: node
});
feature.setId(node.id);