Write fill and outline in PolyStyle
Write styles based on style objects appropriate for geometry. Write fill and outline in PolyStyle if false (i.e. non-default) Handle MultiLineString, MultiPoint and MultiPolygon within heterogenous MultiGeometry when writing features Add getGeometriesArrayRecursive method to ol/geom/GeometryCollection to allow for nested MultiGeometry Enhanced write GeometryCollection geometries test A more rigorous write GeometryCollection geometries test including nested collections (the output is simplified to a single MultiGeomtry) Add writeFeatures to outline and fill tests, setting geometry for geometry specific tests Add <fill>0</fill> and <outline>0</outline> to some existing tests
This commit is contained in:
mike-000
@@ -1207,9 +1207,16 @@ describe('ol.format.KML', function() {
|
||||
|
||||
it('can write GeometryCollection geometries', function() {
|
||||
const collection = new GeometryCollection([
|
||||
new Point([1, 2]),
|
||||
new LineString([[1, 2], [3, 4]]),
|
||||
new Polygon([[[1, 2], [3, 4], [3, 2], [1, 2]]])
|
||||
new GeometryCollection([
|
||||
new Point([1, 2]),
|
||||
new LineString([[1, 2], [3, 4]]),
|
||||
new Polygon([[[1, 2], [3, 4], [3, 2], [1, 2]]])
|
||||
]),
|
||||
new GeometryCollection([
|
||||
new MultiPoint([[5, 6], [9, 10]]),
|
||||
new MultiLineString([[[5, 6], [7, 8]], [[9, 10], [11, 12]]]),
|
||||
new MultiPolygon([[[[5, 6], [7, 8], [7, 6], [5, 6]]], [[[9, 10], [11, 12], [11, 10], [9, 10]]]])
|
||||
])
|
||||
]);
|
||||
const features = [new Feature(collection)];
|
||||
const node = format.writeFeaturesNode(features);
|
||||
@@ -1234,6 +1241,32 @@ describe('ol.format.KML', function() {
|
||||
' </LinearRing>' +
|
||||
' </outerBoundaryIs>' +
|
||||
' </Polygon>' +
|
||||
' <Point>' +
|
||||
' <coordinates>5,6</coordinates>' +
|
||||
' </Point>' +
|
||||
' <Point>' +
|
||||
' <coordinates>9,10</coordinates>' +
|
||||
' </Point>' +
|
||||
' <LineString>' +
|
||||
' <coordinates>5,6 7,8</coordinates>' +
|
||||
' </LineString>' +
|
||||
' <LineString>' +
|
||||
' <coordinates>9,10 11,12</coordinates>' +
|
||||
' </LineString>' +
|
||||
' <Polygon>' +
|
||||
' <outerBoundaryIs>' +
|
||||
' <LinearRing>' +
|
||||
' <coordinates>5,6 7,8 7,6 5,6</coordinates>' +
|
||||
' </LinearRing>' +
|
||||
' </outerBoundaryIs>' +
|
||||
' </Polygon>' +
|
||||
' <Polygon>' +
|
||||
' <outerBoundaryIs>' +
|
||||
' <LinearRing>' +
|
||||
' <coordinates>9,10 11,12 11,10 9,10</coordinates>' +
|
||||
' </LinearRing>' +
|
||||
' </outerBoundaryIs>' +
|
||||
' </Polygon>' +
|
||||
' </MultiGeometry>' +
|
||||
' </Placemark>' +
|
||||
'</kml>';
|
||||
@@ -1621,6 +1654,9 @@ describe('ol.format.KML', function() {
|
||||
' <color>ff332211</color>' +
|
||||
' <width>2</width>' +
|
||||
' </LineStyle>' +
|
||||
' <PolyStyle>' +
|
||||
' <fill>0</fill>' +
|
||||
' </PolyStyle>' +
|
||||
' </Style>' +
|
||||
' <ExtendedData>' +
|
||||
' <Data name="foo"/>' +
|
||||
@@ -2164,6 +2200,43 @@ describe('ol.format.KML', function() {
|
||||
expect(strokeStyle.getWidth()).to.be(9);
|
||||
expect(style.getText()).to.be(getDefaultTextStyle());
|
||||
expect(style.getZIndex()).to.be(undefined);
|
||||
|
||||
const lineString = new LineString([[1, 2], [3, 4]]);
|
||||
const polygon = new Polygon([[[0, 0], [0, 2], [2, 2], [2, 0], [0, 0]]]);
|
||||
const collection = new GeometryCollection([lineString, polygon]);
|
||||
f.setGeometry(collection);
|
||||
const node = format.writeFeaturesNode(fs);
|
||||
const text1 =
|
||||
'<kml xmlns="http://www.opengis.net/kml/2.2"' +
|
||||
' xmlns:gx="http://www.google.com/kml/ext/2.2"' +
|
||||
' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"' +
|
||||
' xsi:schemaLocation="http://www.opengis.net/kml/2.2' +
|
||||
' https://developers.google.com/kml/schema/kml22gx.xsd">' +
|
||||
' <Placemark>' +
|
||||
' <Style>' +
|
||||
' <LineStyle>' +
|
||||
' <color>12345678</color>' +
|
||||
' <width>9</width>' +
|
||||
' </LineStyle>' +
|
||||
' <PolyStyle>' +
|
||||
' <fill>0</fill>' +
|
||||
' </PolyStyle>' +
|
||||
' </Style>' +
|
||||
' <MultiGeometry>' +
|
||||
' <LineString>' +
|
||||
' <coordinates>1,2 3,4</coordinates>' +
|
||||
' </LineString>' +
|
||||
' <Polygon>' +
|
||||
' <outerBoundaryIs>' +
|
||||
' <LinearRing>' +
|
||||
' <coordinates>0,0 0,2 2,2 2,0 0,0</coordinates>' +
|
||||
' </LinearRing>' +
|
||||
' </outerBoundaryIs>' +
|
||||
' </Polygon>' +
|
||||
' </MultiGeometry>' +
|
||||
' </Placemark>' +
|
||||
'</kml>';
|
||||
expect(node).to.xmleql(parse(text1));
|
||||
});
|
||||
|
||||
it('disables the stroke when outline is \'0\'', function() {
|
||||
@@ -2233,6 +2306,41 @@ describe('ol.format.KML', function() {
|
||||
expect(style1.getFill()).to.be(fillStyle);
|
||||
expect(style1.getStroke()).to.be(null);
|
||||
expect(style1.getZIndex()).to.be(undefined);
|
||||
|
||||
f.setGeometry(collectionFeature.getGeometry());
|
||||
const node = format.writeFeaturesNode(fs);
|
||||
const text1 =
|
||||
'<kml xmlns="http://www.opengis.net/kml/2.2"' +
|
||||
' xmlns:gx="http://www.google.com/kml/ext/2.2"' +
|
||||
' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"' +
|
||||
' xsi:schemaLocation="http://www.opengis.net/kml/2.2' +
|
||||
' https://developers.google.com/kml/schema/kml22gx.xsd">' +
|
||||
' <Placemark>' +
|
||||
' <Style>' +
|
||||
' <LineStyle>' +
|
||||
' <color>12345678</color>' +
|
||||
' <width>9</width>' +
|
||||
' </LineStyle>' +
|
||||
' <PolyStyle>' +
|
||||
' <color>12345678</color>' +
|
||||
' <outline>0</outline>' +
|
||||
' </PolyStyle>' +
|
||||
' </Style>' +
|
||||
' <MultiGeometry>' +
|
||||
' <LineString>' +
|
||||
' <coordinates>1,2 3,4</coordinates>' +
|
||||
' </LineString>' +
|
||||
' <Polygon>' +
|
||||
' <outerBoundaryIs>' +
|
||||
' <LinearRing>' +
|
||||
' <coordinates>0,0 0,2 2,2 2,0 0,0</coordinates>' +
|
||||
' </LinearRing>' +
|
||||
' </outerBoundaryIs>' +
|
||||
' </Polygon>' +
|
||||
' </MultiGeometry>' +
|
||||
' </Placemark>' +
|
||||
'</kml>';
|
||||
expect(node).to.xmleql(parse(text1));
|
||||
});
|
||||
|
||||
it('disables both fill and stroke when fill and outline are \'0\'',
|
||||
@@ -2302,6 +2410,41 @@ describe('ol.format.KML', function() {
|
||||
expect(style1.getFill()).to.be(null);
|
||||
expect(style1.getStroke()).to.be(null);
|
||||
expect(style1.getZIndex()).to.be(undefined);
|
||||
|
||||
f.setGeometry(collectionFeature.getGeometry());
|
||||
const node = format.writeFeaturesNode(fs);
|
||||
const text1 =
|
||||
'<kml xmlns="http://www.opengis.net/kml/2.2"' +
|
||||
' xmlns:gx="http://www.google.com/kml/ext/2.2"' +
|
||||
' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"' +
|
||||
' xsi:schemaLocation="http://www.opengis.net/kml/2.2' +
|
||||
' https://developers.google.com/kml/schema/kml22gx.xsd">' +
|
||||
' <Placemark>' +
|
||||
' <Style>' +
|
||||
' <LineStyle>' +
|
||||
' <color>12345678</color>' +
|
||||
' <width>9</width>' +
|
||||
' </LineStyle>' +
|
||||
' <PolyStyle>' +
|
||||
' <fill>0</fill>' +
|
||||
' <outline>0</outline>' +
|
||||
' </PolyStyle>' +
|
||||
' </Style>' +
|
||||
' <MultiGeometry>' +
|
||||
' <LineString>' +
|
||||
' <coordinates>1,2 3,4</coordinates>' +
|
||||
' </LineString>' +
|
||||
' <Polygon>' +
|
||||
' <outerBoundaryIs>' +
|
||||
' <LinearRing>' +
|
||||
' <coordinates>0,0 0,2 2,2 2,0 0,0</coordinates>' +
|
||||
' </LinearRing>' +
|
||||
' </outerBoundaryIs>' +
|
||||
' </Polygon>' +
|
||||
' </MultiGeometry>' +
|
||||
' </Placemark>' +
|
||||
'</kml>';
|
||||
expect(node).to.xmleql(parse(text1));
|
||||
});
|
||||
|
||||
it('can create text style for named point placemarks (including html character codes)', function() {
|
||||
@@ -2392,6 +2535,10 @@ describe('ol.format.KML', function() {
|
||||
' <hotSpot x="12" y="12" xunits="pixels" ' +
|
||||
' yunits="pixels"/>' +
|
||||
' </IconStyle>' +
|
||||
' <PolyStyle>' +
|
||||
' <fill>0</fill>' +
|
||||
' <outline>0</outline>' +
|
||||
' </PolyStyle>' +
|
||||
' </Style>' +
|
||||
' </Placemark>' +
|
||||
'</kml>';
|
||||
@@ -2440,6 +2587,10 @@ describe('ol.format.KML', function() {
|
||||
' https://developers.google.com/kml/schema/kml22gx.xsd">' +
|
||||
' <Placemark>' +
|
||||
' <Style>' +
|
||||
' <PolyStyle>' +
|
||||
' <fill>0</fill>' +
|
||||
' <outline>0</outline>' +
|
||||
' </PolyStyle>' +
|
||||
' </Style>' +
|
||||
' </Placemark>' +
|
||||
'</kml>';
|
||||
@@ -2472,13 +2623,17 @@ describe('ol.format.KML', function() {
|
||||
' <color>ffdf220c</color>' +
|
||||
' <scale>0.5</scale>' +
|
||||
' </LabelStyle>' +
|
||||
' <PolyStyle>' +
|
||||
' <fill>0</fill>' +
|
||||
' <outline>0</outline>' +
|
||||
' </PolyStyle>' +
|
||||
' </Style>' +
|
||||
' </Placemark>' +
|
||||
'</kml>';
|
||||
expect(node).to.xmleql(parse(text));
|
||||
});
|
||||
|
||||
it('can write an feature\'s stroke style', function() {
|
||||
it('can write an feature\'s stroke style without fill', function() {
|
||||
const style = new Style({
|
||||
stroke: new Stroke({
|
||||
color: '#112233',
|
||||
@@ -2500,13 +2655,16 @@ describe('ol.format.KML', function() {
|
||||
' <color>ff332211</color>' +
|
||||
' <width>2</width>' +
|
||||
' </LineStyle>' +
|
||||
' <PolyStyle>' +
|
||||
' <fill>0</fill>' +
|
||||
' </PolyStyle>' +
|
||||
' </Style>' +
|
||||
' </Placemark>' +
|
||||
'</kml>';
|
||||
expect(node).to.xmleql(parse(text));
|
||||
});
|
||||
|
||||
it('can write an feature\'s fill style', function() {
|
||||
it('can write an feature\'s fill style without outline', function() {
|
||||
const style = new Style({
|
||||
fill: new Fill({
|
||||
color: 'rgba(12, 34, 223, 0.7)'
|
||||
@@ -2525,6 +2683,41 @@ describe('ol.format.KML', function() {
|
||||
' <Style>' +
|
||||
' <PolyStyle>' +
|
||||
' <color>b2df220c</color>' +
|
||||
' <outline>0</outline>' +
|
||||
' </PolyStyle>' +
|
||||
' </Style>' +
|
||||
' </Placemark>' +
|
||||
'</kml>';
|
||||
expect(node).to.xmleql(parse(text));
|
||||
});
|
||||
|
||||
it('can write an feature\'s fill style and outline', function() {
|
||||
const style = new Style({
|
||||
fill: new Fill({
|
||||
color: 'rgba(12, 34, 223, 0.7)'
|
||||
}),
|
||||
stroke: new Stroke({
|
||||
color: '#112233',
|
||||
width: 2
|
||||
})
|
||||
});
|
||||
const feature = new Feature();
|
||||
feature.setStyle([style]);
|
||||
const node = format.writeFeaturesNode([feature]);
|
||||
const text =
|
||||
'<kml xmlns="http://www.opengis.net/kml/2.2"' +
|
||||
' xmlns:gx="http://www.google.com/kml/ext/2.2"' +
|
||||
' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"' +
|
||||
' xsi:schemaLocation="http://www.opengis.net/kml/2.2' +
|
||||
' https://developers.google.com/kml/schema/kml22gx.xsd">' +
|
||||
' <Placemark>' +
|
||||
' <Style>' +
|
||||
' <LineStyle>' +
|
||||
' <color>ff332211</color>' +
|
||||
' <width>2</width>' +
|
||||
' </LineStyle>' +
|
||||
' <PolyStyle>' +
|
||||
' <color>b2df220c</color>' +
|
||||
' </PolyStyle>' +
|
||||
' </Style>' +
|
||||
' </Placemark>' +
|
||||
@@ -2554,6 +2747,7 @@ describe('ol.format.KML', function() {
|
||||
' <Style>' +
|
||||
' <PolyStyle>' +
|
||||
' <color>b2df220c</color>' +
|
||||
' <outline>0</outline>' +
|
||||
' </PolyStyle>' +
|
||||
' </Style>' +
|
||||
' </Placemark>' +
|
||||
@@ -2561,6 +2755,7 @@ describe('ol.format.KML', function() {
|
||||
' <Style>' +
|
||||
' <PolyStyle>' +
|
||||
' <color>b2df220c</color>' +
|
||||
' <outline>0</outline>' +
|
||||
' </PolyStyle>' +
|
||||
' </Style>' +
|
||||
' </Placemark>' +
|
||||
|
||||
Reference in New Issue
Block a user