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

Quotes topojson properties

Browse Source
This commit is contained in:
Frederic Junod
2018-09-14 12:45:41 +02:00
parent abc3279752
commit ba53b5e8aa
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/format/TopoJSON.js
+16 -16
View File
@@ -93,18 +93,18 @@ class TopoJSON extends JSONFeature {
if (object.type == 'Topology') { if (object.type == 'Topology') {
const topoJSONTopology = /** @type {TopoJSONTopology} */ (object); const topoJSONTopology = /** @type {TopoJSONTopology} */ (object);
let transform, scale = null, translate = null; let transform, scale = null, translate = null;
if (topoJSONTopology.transform) { if (topoJSONTopology['transform']) {
transform = topoJSONTopology.transform; transform = topoJSONTopology['transform'];
scale = transform.scale; scale = transform['scale'];
translate = transform.translate; translate = transform['translate'];
} }
const arcs = topoJSONTopology.arcs; const arcs = topoJSONTopology['arcs'];
if (transform) { if (transform) {
transformArcs(arcs, scale, translate); transformArcs(arcs, scale, translate);
} }
/** @type {Array<Feature>} */ /** @type {Array<Feature>} */
const features = []; const features = [];
const topoJSONFeatures = topoJSONTopology.objects; const topoJSONFeatures = topoJSONTopology['objects'];
const property = this.layerName_; const property = this.layerName_;
let feature; let feature;
for (const objectName in topoJSONFeatures) { for (const objectName in topoJSONFeatures) {
@@ -195,7 +195,7 @@ function concatenateArcs(indices, arcs) {
* @return {Point} Geometry. * @return {Point} Geometry.
*/ */
function readPointGeometry(object, scale, translate) { function readPointGeometry(object, scale, translate) {
const coordinates = object.coordinates; const coordinates = object['coordinates'];
if (scale && translate) { if (scale && translate) {
transformVertex(coordinates, scale, translate); transformVertex(coordinates, scale, translate);
} }
@@ -212,7 +212,7 @@ function readPointGeometry(object, scale, translate) {
* @return {MultiPoint} Geometry. * @return {MultiPoint} Geometry.
*/ */
function readMultiPointGeometry(object, scale, translate) { function readMultiPointGeometry(object, scale, translate) {
const coordinates = object.coordinates; const coordinates = object['coordinates'];
if (scale && translate) { if (scale && translate) {
for (let i = 0, ii = coordinates.length; i < ii; ++i) { for (let i = 0, ii = coordinates.length; i < ii; ++i) {
transformVertex(coordinates[i], scale, translate); transformVertex(coordinates[i], scale, translate);
@@ -230,7 +230,7 @@ function readMultiPointGeometry(object, scale, translate) {
* @return {LineString} Geometry. * @return {LineString} Geometry.
*/ */
function readLineStringGeometry(object, arcs) { function readLineStringGeometry(object, arcs) {
const coordinates = concatenateArcs(object.arcs, arcs); const coordinates = concatenateArcs(object['arcs'], arcs);
return new LineString(coordinates); return new LineString(coordinates);
} }
@@ -244,8 +244,8 @@ function readLineStringGeometry(object, arcs) {
*/ */
function readMultiLineStringGeometry(object, arcs) { function readMultiLineStringGeometry(object, arcs) {
const coordinates = []; const coordinates = [];
for (let i = 0, ii = object.arcs.length; i < ii; ++i) { for (let i = 0, ii = object['arcs'].length; i < ii; ++i) {
coordinates[i] = concatenateArcs(object.arcs[i], arcs); coordinates[i] = concatenateArcs(object['arcs'][i], arcs);
} }
return new MultiLineString(coordinates); return new MultiLineString(coordinates);
} }
@@ -260,8 +260,8 @@ function readMultiLineStringGeometry(object, arcs) {
*/ */
function readPolygonGeometry(object, arcs) { function readPolygonGeometry(object, arcs) {
const coordinates = []; const coordinates = [];
for (let i = 0, ii = object.arcs.length; i < ii; ++i) { for (let i = 0, ii = object['arcs'].length; i < ii; ++i) {
coordinates[i] = concatenateArcs(object.arcs[i], arcs); coordinates[i] = concatenateArcs(object['arcs'][i], arcs);
} }
return new Polygon(coordinates); return new Polygon(coordinates);
} }
@@ -276,9 +276,9 @@ function readPolygonGeometry(object, arcs) {
*/ */
function readMultiPolygonGeometry(object, arcs) { function readMultiPolygonGeometry(object, arcs) {
const coordinates = []; const coordinates = [];
for (let i = 0, ii = object.arcs.length; i < ii; ++i) { for (let i = 0, ii = object['arcs'].length; i < ii; ++i) {
// for each polygon // for each polygon
const polyArray = object.arcs[i]; const polyArray = object['arcs'][i];
const ringCoords = []; const ringCoords = [];
for (let j = 0, jj = polyArray.length; j < jj; ++j) { for (let j = 0, jj = polyArray.length; j < jj; ++j) {
// for each ring // for each ring
@@ -305,7 +305,7 @@ function readMultiPolygonGeometry(object, arcs) {
* @return {Array<Feature>} Array of features. * @return {Array<Feature>} Array of features.
*/ */
function readFeaturesFromGeometryCollection(collection, arcs, scale, translate, property, name, opt_options) { function readFeaturesFromGeometryCollection(collection, arcs, scale, translate, property, name, opt_options) {
const geometries = collection.geometries; const geometries = collection['geometries'];
const features = []; const features = [];
for (let i = 0, ii = geometries.length; i < ii; ++i) { for (let i = 0, ii = geometries.length; i < ii; ++i) {
features[i] = readFeatureFromGeometry( features[i] = readFeatureFromGeometry(