ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename _ol_geom_Geometry_ to Geometry

Browse Source
This commit is contained in:
Tim Schaub
2017-12-14 08:58:46 -07:00
parent ac7985a5ad
commit 87e665d60e
9 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/format/Feature.js
+2 -2
View File
@@ -1,7 +1,7 @@
/**
* @module ol/format/Feature
*/
import _ol_geom_Geometry_ from '../geom/Geometry.js';
import Geometry from '../geom/Geometry.js';
import _ol_obj_ from '../obj.js';
import {get as getProjection, equivalent as equivalentProjection, transformExtent} from '../proj.js';
@@ -184,7 +184,7 @@ _ol_format_Feature_.transformWithOptions = function(
var transformed;
if (featureProjection && dataProjection &&
!equivalentProjection(featureProjection, dataProjection)) {
if (geometry instanceof _ol_geom_Geometry_) {
if (geometry instanceof Geometry) {
transformed = (write ? geometry.clone() : geometry).transform(
write ? featureProjection : dataProjection,
write ? dataProjection : featureProjection);
src/ol/format/GML2.js
+2 -2
View File
@@ -6,7 +6,7 @@ import {createOrUpdate} from '../extent.js';
import _ol_format_Feature_ from '../format/Feature.js';
import _ol_format_GMLBase_ from '../format/GMLBase.js';
import _ol_format_XSD_ from '../format/XSD.js';
import _ol_geom_Geometry_ from '../geom/Geometry.js';
import Geometry from '../geom/Geometry.js';
import _ol_obj_ from '../obj.js';
import {get as getProjection, transformExtent} from '../proj.js';
import _ol_xml_ from '../xml.js';
@@ -254,7 +254,7 @@ _ol_format_GML2_.prototype.writeFeatureElement = function(node, feature, objectS
if (value !== null) {
keys.push(key);
values.push(value);
if (key == geometryName || value instanceof _ol_geom_Geometry_) {
if (key == geometryName || value instanceof Geometry) {
if (!(key in context.serializers[featureNS])) {
context.serializers[featureNS][key] = _ol_xml_.makeChildAppender(
this.writeGeometryElement, this);
src/ol/format/GML3.js
+2 -2
View File
@@ -7,7 +7,7 @@ import {createOrUpdate} from '../extent.js';
import _ol_format_Feature_ from '../format/Feature.js';
import _ol_format_GMLBase_ from '../format/GMLBase.js';
import _ol_format_XSD_ from '../format/XSD.js';
import _ol_geom_Geometry_ from '../geom/Geometry.js';
import Geometry from '../geom/Geometry.js';
import _ol_geom_GeometryLayout_ from '../geom/GeometryLayout.js';
import LineString from '../geom/LineString.js';
import MultiLineString from '../geom/MultiLineString.js';
@@ -996,7 +996,7 @@ _ol_format_GML3_.prototype.writeFeatureElement = function(node, feature, objectS
if (value !== null) {
keys.push(key);
values.push(value);
if (key == geometryName || value instanceof _ol_geom_Geometry_) {
if (key == geometryName || value instanceof Geometry) {
if (!(key in context.serializers[featureNS])) {
context.serializers[featureNS][key] = _ol_xml_.makeChildAppender(
this.writeGeometryElement, this);
src/ol/format/WFS.js
+3 -3
View File
@@ -9,7 +9,7 @@ import _ol_format_GMLBase_ from '../format/GMLBase.js';
import _ol_format_filter_ from '../format/filter.js';
import _ol_format_XMLFeature_ from '../format/XMLFeature.js';
import _ol_format_XSD_ from '../format/XSD.js';
import _ol_geom_Geometry_ from '../geom/Geometry.js';
import Geometry from '../geom/Geometry.js';
import _ol_obj_ from '../obj.js';
import {get as getProjection} from '../proj.js';
import _ol_xml_ from '../xml.js';
@@ -490,7 +490,7 @@ _ol_format_WFS_.writeUpdate_ = function(node, feature, objectStack) {
var value = feature.get(keys[i]);
if (value !== undefined) {
var name = keys[i];
if (value instanceof _ol_geom_Geometry_) {
if (value instanceof Geometry) {
name = geometryName;
}
values.push({name: name, value: value});
@@ -522,7 +522,7 @@ _ol_format_WFS_.writeProperty_ = function(node, pair, objectStack) {
if (pair.value !== undefined && pair.value !== null) {
var value = _ol_xml_.createElementNS(_ol_format_WFS_.WFSNS, 'Value');
node.appendChild(value);
if (pair.value instanceof _ol_geom_Geometry_) {
if (pair.value instanceof Geometry) {
if (gmlVersion === 2) {
_ol_format_GML2_.prototype.writeGeometryElement(value,
pair.value, objectStack);