Simplify import path in ol/format/

This commit is contained in:
Frederic Junod
2018-10-12 14:46:10 +02:00
parent 43def3194f
commit 711afac80f
41 changed files with 87 additions and 87 deletions

View File

@@ -4,8 +4,8 @@
import Feature from '../Feature.js';
import {assert} from '../asserts.js';
import {containsExtent} from '../extent.js';
import {transformWithOptions} from '../format/Feature.js';
import JSONFeature from '../format/JSONFeature.js';
import {transformWithOptions} from './Feature.js';
import JSONFeature from './JSONFeature.js';
import GeometryLayout from '../geom/GeometryLayout.js';
import GeometryType from '../geom/GeometryType.js';
import LineString from '../geom/LineString.js';

View File

@@ -1,7 +1,7 @@
/**
* @module ol/format/GML
*/
import GML3 from '../format/GML3.js';
import GML3 from './GML3.js';
/**
* @classdesc

View File

@@ -2,9 +2,9 @@
* @module ol/format/GML2
*/
import {createOrUpdate} from '../extent.js';
import {transformWithOptions} from '../format/Feature.js';
import GMLBase, {GMLNS} from '../format/GMLBase.js';
import {writeStringTextNode} from '../format/xsd.js';
import {transformWithOptions} from './Feature.js';
import GMLBase, {GMLNS} from './GMLBase.js';
import {writeStringTextNode} from './xsd.js';
import {assign} from '../obj.js';
import {get as getProjection, transformExtent} from '../proj.js';
import {createElementNS, getAllTextContent, makeArrayPusher, makeChildAppender,

View File

@@ -3,9 +3,9 @@
*/
import {extend} from '../array.js';
import {createOrUpdate} from '../extent.js';
import {transformWithOptions} from '../format/Feature.js';
import GMLBase, {GMLNS} from '../format/GMLBase.js';
import {readNonNegativeIntegerString, writeStringTextNode} from '../format/xsd.js';
import {transformWithOptions} from './Feature.js';
import GMLBase, {GMLNS} from './GMLBase.js';
import {readNonNegativeIntegerString, writeStringTextNode} from './xsd.js';
import GeometryLayout from '../geom/GeometryLayout.js';
import LineString from '../geom/LineString.js';
import MultiLineString from '../geom/MultiLineString.js';

View File

@@ -6,8 +6,8 @@
// envelopes/extents, only geometries!
import {extend} from '../array.js';
import Feature from '../Feature.js';
import {transformWithOptions} from '../format/Feature.js';
import XMLFeature from '../format/XMLFeature.js';
import {transformWithOptions} from './Feature.js';
import XMLFeature from './XMLFeature.js';
import GeometryLayout from '../geom/GeometryLayout.js';
import LineString from '../geom/LineString.js';
import LinearRing from '../geom/LinearRing.js';

View File

@@ -3,9 +3,9 @@
*/
import Feature from '../Feature.js';
import {includes} from '../array.js';
import {transformWithOptions} from '../format/Feature.js';
import XMLFeature from '../format/XMLFeature.js';
import {readString, readDecimal, readNonNegativeInteger, readDateTime, writeStringTextNode, writeNonNegativeIntegerTextNode, writeDecimalTextNode, writeDateTimeTextNode} from '../format/xsd.js';
import {transformWithOptions} from './Feature.js';
import XMLFeature from './XMLFeature.js';
import {readString, readDecimal, readNonNegativeInteger, readDateTime, writeStringTextNode, writeNonNegativeIntegerTextNode, writeDecimalTextNode, writeDateTimeTextNode} from './xsd.js';
import GeometryLayout from '../geom/GeometryLayout.js';
import GeometryType from '../geom/GeometryType.js';
import LineString from '../geom/LineString.js';

View File

@@ -4,8 +4,8 @@
import {assert} from '../asserts.js';
import Feature from '../Feature.js';
import {transformWithOptions} from '../format/Feature.js';
import JSONFeature from '../format/JSONFeature.js';
import {transformWithOptions} from './Feature.js';
import JSONFeature from './JSONFeature.js';
import GeometryCollection from '../geom/GeometryCollection.js';
import LineString from '../geom/LineString.js';
import MultiLineString from '../geom/MultiLineString.js';

View File

@@ -2,8 +2,8 @@
* @module ol/format/IGC
*/
import Feature from '../Feature.js';
import {transformWithOptions} from '../format/Feature.js';
import TextFeature from '../format/TextFeature.js';
import {transformWithOptions} from './Feature.js';
import TextFeature from './TextFeature.js';
import GeometryLayout from '../geom/GeometryLayout.js';
import LineString from '../geom/LineString.js';
import {get as getProjection} from '../proj.js';

View File

@@ -2,8 +2,8 @@
* @module ol/format/JSONFeature
*/
import {abstract} from '../util.js';
import FeatureFormat from '../format/Feature.js';
import FormatType from '../format/FormatType.js';
import FeatureFormat from './Feature.js';
import FormatType from './FormatType.js';
/**
* @classdesc

View File

@@ -5,9 +5,9 @@ import Feature from '../Feature.js';
import {extend, includes} from '../array.js';
import {assert} from '../asserts.js';
import {asArray} from '../color.js';
import {transformWithOptions} from '../format/Feature.js';
import XMLFeature from '../format/XMLFeature.js';
import {readDecimal, readBoolean, readString, writeStringTextNode, writeCDATASection, writeDecimalTextNode, writeBooleanTextNode} from '../format/xsd.js';
import {transformWithOptions} from './Feature.js';
import XMLFeature from './XMLFeature.js';
import {readDecimal, readBoolean, readString, writeStringTextNode, writeCDATASection, writeDecimalTextNode, writeBooleanTextNode} from './xsd.js';
import GeometryCollection from '../geom/GeometryCollection.js';
import GeometryLayout from '../geom/GeometryLayout.js';
import GeometryType from '../geom/GeometryType.js';

View File

@@ -4,8 +4,8 @@
// FIXME add typedef for stack state objects
import {extend} from '../array.js';
import Feature from '../Feature.js';
import {transformWithOptions} from '../format/Feature.js';
import XMLFeature from '../format/XMLFeature.js';
import {transformWithOptions} from './Feature.js';
import XMLFeature from './XMLFeature.js';
import GeometryLayout from '../geom/GeometryLayout.js';
import LineString from '../geom/LineString.js';
import Point from '../geom/Point.js';

View File

@@ -1,9 +1,9 @@
/**
* @module ol/format/OWS
*/
import {readHref} from '../format/XLink.js';
import XML from '../format/XML.js';
import {readString} from '../format/xsd.js';
import {readHref} from './XLink.js';
import XML from './XML.js';
import {readString} from './xsd.js';
import {makeObjectPropertyPusher, makeObjectPropertySetter, makeStructureNS, pushParseAndPop} from '../xml.js';

View File

@@ -3,8 +3,8 @@
*/
import {assert} from '../asserts.js';
import Feature from '../Feature.js';
import {transformWithOptions} from '../format/Feature.js';
import TextFeature from '../format/TextFeature.js';
import {transformWithOptions} from './Feature.js';
import TextFeature from './TextFeature.js';
import GeometryLayout from '../geom/GeometryLayout.js';
import LineString from '../geom/LineString.js';
import {getStrideForLayout} from '../geom/SimpleGeometry.js';

View File

@@ -2,8 +2,8 @@
* @module ol/format/TopoJSON
*/
import Feature from '../Feature.js';
import {transformWithOptions} from '../format/Feature.js';
import JSONFeature from '../format/JSONFeature.js';
import {transformWithOptions} from './Feature.js';
import JSONFeature from './JSONFeature.js';
import LineString from '../geom/LineString.js';
import MultiLineString from '../geom/MultiLineString.js';
import MultiPoint from '../geom/MultiPoint.js';

View File

@@ -2,12 +2,12 @@
* @module ol/format/WFS
*/
import {assert} from '../asserts.js';
import GML2 from '../format/GML2.js';
import GML3 from '../format/GML3.js';
import GMLBase, {GMLNS} from '../format/GMLBase.js';
import {and as andFilter, bbox as bboxFilter} from '../format/filter.js';
import XMLFeature from '../format/XMLFeature.js';
import {readNonNegativeIntegerString, readNonNegativeInteger, writeStringTextNode} from '../format/xsd.js';
import GML2 from './GML2.js';
import GML3 from './GML3.js';
import GMLBase, {GMLNS} from './GMLBase.js';
import {and as andFilter, bbox as bboxFilter} from './filter.js';
import XMLFeature from './XMLFeature.js';
import {readNonNegativeIntegerString, readNonNegativeInteger, writeStringTextNode} from './xsd.js';
import {assign} from '../obj.js';
import {get as getProjection} from '../proj.js';
import {createElementNS, isDocument, makeArrayPusher, makeChildAppender,

View File

@@ -2,8 +2,8 @@
* @module ol/format/WKT
*/
import Feature from '../Feature.js';
import {transformWithOptions} from '../format/Feature.js';
import TextFeature from '../format/TextFeature.js';
import {transformWithOptions} from './Feature.js';
import TextFeature from './TextFeature.js';
import GeometryCollection from '../geom/GeometryCollection.js';
import GeometryType from '../geom/GeometryType.js';
import GeometryLayout from '../geom/GeometryLayout.js';

View File

@@ -1,9 +1,9 @@
/**
* @module ol/format/WMSCapabilities
*/
import {readHref} from '../format/XLink.js';
import XML from '../format/XML.js';
import {readDecimalString, readString, readNonNegativeInteger, readDecimal, readBooleanString, readNonNegativeIntegerString} from '../format/xsd.js';
import {readHref} from './XLink.js';
import XML from './XML.js';
import {readDecimalString, readString, readNonNegativeInteger, readDecimal, readBooleanString, readNonNegativeIntegerString} from './xsd.js';
import {makeArrayPusher, makeObjectPropertyPusher, makeObjectPropertySetter,
makeStructureNS, pushParseAndPop} from '../xml.js';

View File

@@ -2,8 +2,8 @@
* @module ol/format/WMSGetFeatureInfo
*/
import {extend, includes} from '../array.js';
import GML2 from '../format/GML2.js';
import XMLFeature from '../format/XMLFeature.js';
import GML2 from './GML2.js';
import XMLFeature from './XMLFeature.js';
import {assign} from '../obj.js';
import {makeArrayPusher, makeStructureNS, pushParseAndPop} from '../xml.js';

View File

@@ -2,10 +2,10 @@
* @module ol/format/WMTSCapabilities
*/
import {boundingExtent} from '../extent.js';
import OWS from '../format/OWS.js';
import {readHref} from '../format/XLink.js';
import XML from '../format/XML.js';
import {readString, readNonNegativeInteger, readDecimal} from '../format/xsd.js';
import OWS from './OWS.js';
import {readHref} from './XLink.js';
import XML from './XML.js';
import {readString, readNonNegativeInteger, readDecimal} from './xsd.js';
import {pushParseAndPop, makeStructureNS,
makeObjectPropertySetter, makeObjectPropertyPusher, makeArrayPusher} from '../xml.js';

View File

@@ -1,23 +1,23 @@
/**
* @module ol/format/filter
*/
import And from '../format/filter/And.js';
import Bbox from '../format/filter/Bbox.js';
import Contains from '../format/filter/Contains.js';
import During from '../format/filter/During.js';
import EqualTo from '../format/filter/EqualTo.js';
import GreaterThan from '../format/filter/GreaterThan.js';
import GreaterThanOrEqualTo from '../format/filter/GreaterThanOrEqualTo.js';
import Intersects from '../format/filter/Intersects.js';
import IsBetween from '../format/filter/IsBetween.js';
import IsLike from '../format/filter/IsLike.js';
import IsNull from '../format/filter/IsNull.js';
import LessThan from '../format/filter/LessThan.js';
import LessThanOrEqualTo from '../format/filter/LessThanOrEqualTo.js';
import Not from '../format/filter/Not.js';
import NotEqualTo from '../format/filter/NotEqualTo.js';
import Or from '../format/filter/Or.js';
import Within from '../format/filter/Within.js';
import And from './filter/And.js';
import Bbox from './filter/Bbox.js';
import Contains from './filter/Contains.js';
import During from './filter/During.js';
import EqualTo from './filter/EqualTo.js';
import GreaterThan from './filter/GreaterThan.js';
import GreaterThanOrEqualTo from './filter/GreaterThanOrEqualTo.js';
import Intersects from './filter/Intersects.js';
import IsBetween from './filter/IsBetween.js';
import IsLike from './filter/IsLike.js';
import IsNull from './filter/IsNull.js';
import LessThan from './filter/LessThan.js';
import LessThanOrEqualTo from './filter/LessThanOrEqualTo.js';
import Not from './filter/Not.js';
import NotEqualTo from './filter/NotEqualTo.js';
import Or from './filter/Or.js';
import Within from './filter/Within.js';
/**

View File

@@ -1,7 +1,7 @@
/**
* @module ol/format/filter/And
*/
import LogicalNary from '../filter/LogicalNary.js';
import LogicalNary from './LogicalNary.js';
/**
* @classdesc

View File

@@ -1,7 +1,7 @@
/**
* @module ol/format/filter/Bbox
*/
import Filter from '../filter/Filter.js';
import Filter from './Filter.js';
/**
* @classdesc

View File

@@ -1,7 +1,7 @@
/**
* @module ol/format/filter/Comparison
*/
import Filter from '../filter/Filter.js';
import Filter from './Filter.js';
/**
* @classdesc

View File

@@ -1,7 +1,7 @@
/**
* @module ol/format/filter/ComparisonBinary
*/
import Comparison from '../filter/Comparison.js';
import Comparison from './Comparison.js';
/**
* @classdesc

View File

@@ -1,7 +1,7 @@
/**
* @module ol/format/filter/Contains
*/
import Spatial from '../filter/Spatial.js';
import Spatial from './Spatial.js';
/**
* @classdesc

View File

@@ -1,7 +1,7 @@
/**
* @module ol/format/filter/During
*/
import Comparison from '../filter/Comparison.js';
import Comparison from './Comparison.js';
/**
* @classdesc

View File

@@ -1,7 +1,7 @@
/**
* @module ol/format/filter/EqualTo
*/
import ComparisonBinary from '../filter/ComparisonBinary.js';
import ComparisonBinary from './ComparisonBinary.js';
/**
* @classdesc

View File

@@ -1,7 +1,7 @@
/**
* @module ol/format/filter/GreaterThan
*/
import ComparisonBinary from '../filter/ComparisonBinary.js';
import ComparisonBinary from './ComparisonBinary.js';
/**
* @classdesc

View File

@@ -1,7 +1,7 @@
/**
* @module ol/format/filter/GreaterThanOrEqualTo
*/
import ComparisonBinary from '../filter/ComparisonBinary.js';
import ComparisonBinary from './ComparisonBinary.js';
/**
* @classdesc

View File

@@ -1,7 +1,7 @@
/**
* @module ol/format/filter/Intersects
*/
import Spatial from '../filter/Spatial.js';
import Spatial from './Spatial.js';
/**
* @classdesc

View File

@@ -1,7 +1,7 @@
/**
* @module ol/format/filter/IsBetween
*/
import Comparison from '../filter/Comparison.js';
import Comparison from './Comparison.js';
/**
* @classdesc

View File

@@ -1,7 +1,7 @@
/**
* @module ol/format/filter/IsLike
*/
import Comparison from '../filter/Comparison.js';
import Comparison from './Comparison.js';
/**
* @classdesc

View File

@@ -1,7 +1,7 @@
/**
* @module ol/format/filter/IsNull
*/
import Comparison from '../filter/Comparison.js';
import Comparison from './Comparison.js';
/**
* @classdesc

View File

@@ -1,7 +1,7 @@
/**
* @module ol/format/filter/LessThan
*/
import ComparisonBinary from '../filter/ComparisonBinary.js';
import ComparisonBinary from './ComparisonBinary.js';
/**
* @classdesc

View File

@@ -1,7 +1,7 @@
/**
* @module ol/format/filter/LessThanOrEqualTo
*/
import ComparisonBinary from '../filter/ComparisonBinary.js';
import ComparisonBinary from './ComparisonBinary.js';
/**
* @classdesc

View File

@@ -2,7 +2,7 @@
* @module ol/format/filter/LogicalNary
*/
import {assert} from '../../asserts.js';
import Filter from '../filter/Filter.js';
import Filter from './Filter.js';
/**
* @classdesc

View File

@@ -1,7 +1,7 @@
/**
* @module ol/format/filter/Not
*/
import Filter from '../filter/Filter.js';
import Filter from './Filter.js';
/**
* @classdesc

View File

@@ -1,7 +1,7 @@
/**
* @module ol/format/filter/NotEqualTo
*/
import ComparisonBinary from '../filter/ComparisonBinary.js';
import ComparisonBinary from './ComparisonBinary.js';
/**
* @classdesc

View File

@@ -1,7 +1,7 @@
/**
* @module ol/format/filter/Or
*/
import LogicalNary from '../filter/LogicalNary.js';
import LogicalNary from './LogicalNary.js';
/**
* @classdesc

View File

@@ -1,7 +1,7 @@
/**
* @module ol/format/filter/Spatial
*/
import Filter from '../filter/Filter.js';
import Filter from './Filter.js';
/**
* @classdesc

View File

@@ -1,7 +1,7 @@
/**
* @module ol/format/filter/Within
*/
import Spatial from '../filter/Spatial.js';
import Spatial from './Spatial.js';
/**
* @classdesc