Stolstov/collection methods #178

stolstov · 2018-05-28T06:32:24Z

mbasmanova

@stolstov Sergey, thanks for adding support for geometry collections. I'm still going through the changes, but it would be helpful to update commit messages to describe what functionality is added. I assume this PR is adding support for geometry collections input in relationship tests and distance methods.

I noticed that there are 3 commits, but first commit relies on the new file added in the third commit. Would you merge 1st and 3rd commits?

mbasmanova · 2018-05-29T16:37:03Z

src/main/java/com/esri/core/geometry/OGCStructure.java

 import java.util.List;

+import com.esri.core.geometry.ogc.OGCConcreteGeometryCollection;


these imports seem unnecessary

mbasmanova · 2018-05-29T21:40:33Z

src/main/java/com/esri/core/geometry/OGCStructureInternal.java

+
+		@Override
+		public int getGeometryID() {
+			return m_shape.getGeometryUserIndex(m_geom, m_index);


m_shape can be null, in which case this will throw NPE

That's ok to crash as this is internal method and calling getGeometryID after iterator was exhausted is a bug.

mbasmanova · 2018-05-29T21:54:31Z

src/main/java/com/esri/core/geometry/ogc/OGCConcreteGeometryCollection.java

@@ -501,4 +519,303 @@ public int hashCode() {

 		return hash;
 	}
+
+	@Override
+	public double distance(OGCGeometry another) {


It looks like this method returns 0 if another is an empty geometry. Is this correct? Should it throw or return -1 to distinguish between the case when another and this overlap vs. another is empty?

Distance returns NaN for empty input. I'll fix this for collection.

mbasmanova · 2018-05-29T21:56:16Z

src/main/java/com/esri/core/geometry/ogc/OGCConcreteGeometryCollection.java

+
+	@Override
+	public double distance(OGCGeometry another) {
+		double minD = 0;


Some other methods have if (this == another) optimization. Should it be added here as well?

mbasmanova · 2018-05-29T21:58:42Z

src/main/java/com/esri/core/geometry/ogc/OGCConcreteGeometryCollection.java

+				return false;
+		}
+
+		return true;


It looks like a collection of two OGCMultiPoints will incorrectly return true.

mbasmanova · 2018-05-29T22:01:36Z

src/main/java/com/esri/core/geometry/ogc/OGCConcreteGeometryCollection.java

+				continue;
+			}
+
+			throw new GeometryException("internal error");//what else?


perhaps, clarify that unexpected type was encountered

throw new GeometryException("Internal error: unexpected geometry type: " + t);/

mbasmanova · 2018-05-29T22:01:54Z

src/main/java/com/esri/core/geometry/ogc/OGCConcreteGeometryCollection.java

+		}
+
+		OGCMultiPoint multiPoint = null;
+		ArrayList<Geometry> polygons = null;


this can be just List<Geometry>

mbasmanova · 2018-05-29T22:04:24Z

src/main/java/com/esri/core/geometry/ogc/OGCConcreteGeometryCollection.java

+
+	/**
+	 * Fixes topological overlaps in the GeometryCollecion.
+	 * This is equivalent to union of the geometry collection elements.


flatten method already performs union on polygons; should flatten also union points and line strings?

mbasmanova · 2018-05-29T22:05:58Z

src/main/java/com/esri/core/geometry/ogc/OGCConcreteGeometryCollection.java

+	}
+
+	private OGCConcreteGeometryCollection removeOverlapsHelper_(List<Geometry> geoms) {
+		ArrayList<Geometry> result = new ArrayList<Geometry>();


type of result could be just List<Geometry>

mbasmanova · 2018-05-29T22:08:09Z

src/main/java/com/esri/core/geometry/ogc/OGCConcreteGeometryCollection.java

+			for (int j = i + 1; j < geoms.size(); ++j) {
+				Geometry subG = geoms.get(j);
+				current = OperatorDifference.local().execute(current, subG, esriSR, null);
+				if (current.isEmpty())


Why breaking on the first geometry that doesn't overlap current? Shouldn't we check for all geometries first?

We break because the current - subG resulted in empty geometry, so current is completely inside of subG.

mbasmanova · 2018-05-29T22:15:59Z

src/main/java/com/esri/core/geometry/OGCStructureInternal.java

+
+	};
+
+	public static GeometryCursor prepare_for_ops_(GeometryCursor geoms, SpatialReference sr) {


Looks like this method simplifies the shapes. Would it be clearer to rename it to simplify or implement a SimplifyingGeometryCursor instead to match FlatteningGeometryCursor pattern?

mbasmanova · 2018-05-29T22:26:35Z

src/main/java/com/esri/core/geometry/ogc/OGCGeometry.java

-		com.esri.core.geometry.Geometry geom2 = another.getEsriGeometry();
-		return com.esri.core.geometry.GeometryEngine.within(geom1, geom2,
-				getEsriSpatialReference());
+		return another.contains(this);


within is not the same as contains, is it? Also, why is it any different than other relationship methods? E.g. Shouldn't com.esri.core.geometry.ogc.OGCConcreteGeometryCollection ovewrite it?

A.contains(B) == B.within(A), so that's why the change.

@stolstov Makes sense. With this change com.esri.core.geometry.GeometryEngine#within is no longer used. Should it be removed along with OperatorWithin and related classes?

Public classes and methods are likely to be used elsewhere.
e.g. https://github.com/Esri/spatial-framework-for-hadoop/blob/1ed3d421eb5c062a5309f6c610cd646210daf889/hive/src/main/java/com/esri/hadoop/hive/ST_Within.java#L20

@mbasmanova Within/Contains, Disjoint/Intersects are a part of the API although they are trivial calls of one another. They are in OGCGeometry because they are required by the OGC spec.

@mbasmanova The primary API for this library is the one in the core.geometry package. The core.geometry.ogc is more like the facade for the use cases that require OGC spec.

@stolstov Sergey, thanks for clarifying.

mbasmanova · 2018-05-29T22:28:44Z

src/main/java/com/esri/core/geometry/ogc/OGCGeometry.java

@@ -328,6 +325,10 @@ public boolean relate(OGCGeometry another, String matrix) {

 	// analysis
 	public double distance(OGCGeometry another) {
+		if (another.geometryType() == OGCConcreteGeometryCollection.TYPE) {


Shouldn't the same logic apply to other methods, e.g. contains, overlaps, etc.?

Yes most need to be changed eventually.

mbasmanova · 2018-05-29T22:29:54Z

src/main/java/com/esri/core/geometry/ogc/OGCLineString.java

@@ -120,7 +121,7 @@ public OGCPoint endPoint() {

 	@Override
 	public String geometryType() {
-		return "LineString";
+		return TYPE;


This change is unrelated to the change that adds support for geometry collections. It would be helpful to move it into a separate commit.

I call geometryType() in the implementation of isFlattened. I've changed the methods to avoid string compare.

stolstov · 2018-05-29T22:36:13Z

I noticed that there are 3 commits, but first commit relies on the new file added in the third commit. Would you merge 1st and 3rd commits?

I'll "squash and merge" this PR.

mbasmanova · 2018-05-29T22:36:16Z

src/test/java/com/esri/core/geometry/TestOGC.java

+	}
+
+	@Test
+	public void testIntersectsOnGeometryCollection() {


I modified the test to ensure that if intersects is symmetrical and the test failed with NPE:

@Test public void testIntersectsOnGeometryCollection() { assertIntersects("GEOMETRYCOLLECTION (POINT (1 1))", "POINT (1 1)", true); } private void assertIntersects(String wkt, String otherWkt, boolean intersects) { assertEquals(OGCGeometry.fromText(wkt).intersects(OGCGeometry.fromText(otherWkt)), intersects); assertEquals(OGCGeometry.fromText(otherWkt).intersects(OGCGeometry.fromText(wkt)), intersects); }

Here is the failure:

java.lang.NullPointerException at com.esri.core.geometry.RelationalOperations.relate(RelationalOperations.java:45) at com.esri.core.geometry.OperatorDisjointLocal.execute(OperatorDisjointLocal.java:31) at com.esri.core.geometry.GeometryEngine.disjoint(GeometryEngine.java:376) at com.esri.core.geometry.ogc.OGCGeometry.disjoint(OGCGeometry.java:275) at com.esri.core.geometry.ogc.OGCGeometry.intersects(OGCGeometry.java:280) at com.esri.core.geometry.TestOGC.assertIntersects(TestOGC.java:1007) at com.esri.core.geometry.TestOGC.testIntersectsOnGeometryCollection(TestOGC.java:1001)

ok. I'll fix this.

stolstov · 2018-05-29T22:37:57Z

@mbasmanova This PR fixes the unit tests that you listed in the issues.

mbasmanova · 2018-05-30T01:13:50Z

src/main/java/com/esri/core/geometry/ogc/OGCConcreteGeometryCollection.java

+	//Collectively processes group of geometry collections (intersects all segments and clusters points).
+	//Flattens collections, removes overlaps.
+	//Once done, the result collections would work well for topological and relational operations.
+	private List<OGCConcreteGeometryCollection> prepare_for_ops_(List<OGCConcreteGeometryCollection> geoms) {


@stolstov This method doesn't seem to be used. The only callers I see are calling OGCStructureInternal.prepare_for_ops_ directly.

I've commited a change to use it. See changes to difference and intersection

mbasmanova · 2018-05-30T21:56:14Z

src/test/java/com/esri/core/geometry/TestOGC.java

@@ -955,5 +955,86 @@ public void testEmptyBoundary() throws Exception {
 		}
 	}

+	@Test
+	public void testUnionPointWithEmptyLineString() {
+		assertUnion("POINT (1 2)", "LINESTRING EMPTY", "GEOMETRYCOLLECTION (POINT (1 2))");


I'd expect the union of POINT (1, 2) and LINESTRING EMPTY to be POINT (1, 2), but this test asserts the result to be GEOMETRYCOLLECTION (POINT (1 2)).

@mbasmanova Yes, a simpler representation would be better.

mbasmanova · 2018-06-01T19:02:43Z

@stolstov Sergey, are you planning to add more tests? This PR adds a lot of new functionality, but existing tests are spotty. I took a stub at writing tests for the union and found that union of a LINESTRING (0 0, 5 0) and a POLYGON ((0 0, 5 0, 5 5, 0 5, 0 0)) returns GEOMETRYCOLLECTION (LINESTRING (0 0, 5 0), POLYGON ((0 0, 5 0, 5 5, 0 5, 0 0))) instead of POLYGON ((0 0, 5 0, 5 5, 0 5, 0 0)).

Here is the source code for the tests: TestOGCGeometryCollection.java.txt

assertUnion("LINESTRING (0 0, 5 0)", "POLYGON ((0 0, 5 0, 5 5, 0 5, 0 0))", "POLYGON ((0 0, 5 0, 5 5, 0 5, 0 0))");

fails with

org.junit.ComparisonFailure: 
Expected :POLYGON ((0 0, 5 0, 5 5, 0 5, 0 0))
Actual   :GEOMETRYCOLLECTION (LINESTRING (0 0, 5 0), POLYGON ((0 0, 5 0, 5 5, 0 5, 0 0)))

stolstov · 2018-06-01T20:13:32Z

@mbasmanova Maria, thanks for the tests. I'll add them and make sure it works.

stolstov · 2018-06-02T02:35:20Z

@mbasmanova Yea, the bug with polygon vs polyline is in the difference operation. Polyline.difference(polygon) does not erase polyline segments on the polygon boundary.

stolstov · 2018-06-04T00:47:16Z

@mbasmanova I've created an issue for the difference: #179. I've added the fixes and your test to the PR.

mbasmanova

@stolstov Sergey, I started looking into contains and disjoint implementation and found some issues. How would you feel about adding a comprehensive set of tests for these operations?

mbasmanova · 2018-06-04T17:53:23Z

src/main/java/com/esri/core/geometry/OperatorDifferenceLocal.java

@@ -81,9 +81,9 @@ static Geometry difference(Geometry geometry_a, Geometry geometry_b,
 		if (!env_a_inflated.isIntersecting(env_b))
 			return geometry_a;

-		if (dimension_a == 1 && dimension_b == 2)
+		/*if (dimension_a == 1 && dimension_b == 2)


Why comment out and not delete this code?

mbasmanova · 2018-06-04T17:57:08Z

src/main/java/com/esri/core/geometry/ogc/OGCConcreteGeometryCollection.java

+
+		OGCConcreteGeometryCollection flattened1 = flatten();
+		if (flattened1.isEmpty())
+			return true;


The logic at the beginning of this method suggests that contains returns false if any of the geometries is empty. Hence, this should return false.

Yes, thank you

mbasmanova · 2018-06-04T17:57:15Z

src/main/java/com/esri/core/geometry/ogc/OGCConcreteGeometryCollection.java

+		OGCConcreteGeometryCollection otherCol = new OGCConcreteGeometryCollection(another, esriSR);
+		OGCConcreteGeometryCollection flattened2 = otherCol.flatten();
+		if (flattened2.isEmpty())
+			return true;


The logic at the beginning of this method suggests that contains returns false if any of the geometries is empty. Hence, this should return false.

mbasmanova · 2018-06-04T18:51:49Z

src/main/java/com/esri/core/geometry/ogc/OGCConcreteGeometryCollection.java

+			OGCGeometry g2 = flattened2.geometryN(i);
+			boolean good = false;
+			for (int j = 0, n1 = flattened1.numGeometries(); j < n1; ++j) {
+				OGCGeometry g1 = flattened1.geometryN(i);


This should be geometryN(j) not ..(i).

Also, it may happen that neither g1 fully contains a g2, but collectively a set of g1s contain all points in g2. Here is a test case:

public class TestOGCContains { @Test public void testGeometryCollection() { assertContains("GEOMETRYCOLLECTION (POINT (0 0), LINESTRING (0 1, 5 1))", "GEOMETRYCOLLECTION (MULTIPOINT (0 0, 2 1))"); } private void assertContains(String wkt, String otherWkt) { OGCGeometry geometry = OGCGeometry.fromText(wkt); OGCGeometry otherGeometry = OGCGeometry.fromText(otherWkt); assertTrue(geometry.contains(otherGeometry)); assertTrue(otherGeometry.within(geometry)); } }

@mbasmanova Maria, I've added this test and fixed this. Collection contains now uses another.difference(this).isEmpty().

mbasmanova · 2018-06-04T18:54:51Z

src/main/java/com/esri/core/geometry/ogc/OGCConcreteGeometryCollection.java

+		for (int i = 0, n1 = flattened1.numGeometries(); i < n1; ++i) {
+			OGCGeometry g1 = flattened1.geometryN(i);
+			for (int j = 0, n2 = flattened2.numGeometries(); j < n2; ++j) {
+				OGCGeometry g2 = flattened2.geometryN(i);


This should be geometryN(j) not ..(i).

@stolstov I'm still seeing OGCGeometry g2 = flattened2.geometryN(i); using i and not j.

@mbasmanova Sorry about that. I've missed this place. Please, change it locally if you plan testing this, I'll fix this later tonight.

@mbasmanova Should be fixed now. I've added a test for this case.

mbasmanova · 2018-06-07T10:14:26Z

src/main/java/com/esri/core/geometry/ogc/OGCGeometry.java

 	}

 	public boolean contains(OGCGeometry another) {
+		if (another.geometryType() == OGCConcreteGeometryCollection.TYPE) {
+			return another.contains(this);


this.contains(another) is not equal to another.contains(this), is it?

The following test in TestOGCContains.java.txt fails:

assertContains("MULTIPOINT (1 2, 3 4)", "GEOMETRYCOLLECTION (POINT (1 2))");

@mbasmanova Maria, I've forked the repo to continue cleanup with the fixes for the OGC collection here: https://github.com/stolstov/geometry-api-java/tree/ogc_fixes. I've added you as a contributor on the fork as well.

@stolstov Sergey, thanks. How would you like us to use the fork?

@mbasmanova I'd like to use the fork to finish this PR. Once done, I'll merge the forked branch here and then merge this PR. It would also make it simpler for you if you wish to add a commit.

mbasmanova · 2018-06-07T14:25:43Z

@stolstov

A couple of issues with the intersection method:

Intersection of GEOMETRYCOLLECTION (POINT (1 2)) and POINT EMPTY throws "GeometryException: internal error".
Intersection of GEOMETRYCOLLECTION (POINT (1 2), MULTIPOINT (3 4, 5 6)) and POINT (3 4) returns GEOMETRYCOLLECTION (POINT (3 4)) and not POINT (3 4)

Various fixes and TODOs

Ogc fixes

Stolstov/collection methods

mbasmanova · 2018-06-13T18:16:39Z

@stolstov Sergey, I was busy with prestodb/presto#10731 and somewhat lost track of this PR. What are the next steps?

stolstov · 2018-06-13T18:18:56Z

@mbasmanova I'll merge once you and @randallwhitman are OK it.

mbasmanova

@stolstov Sergey, thank you so much for expanding contains, within, intersects, disjoint, distance, difference and intersections operations to support geometry collections. Can't wait to make these available to Presto users.

mbasmanova · 2018-06-14T01:29:45Z

src/test/java/com/esri/core/geometry/TestOGC.java

@@ -955,5 +954,86 @@ public void testEmptyBoundary() throws Exception {
 		}
 	}

+	@Test
+	public void testUnionPointWithEmptyLineString() {


let's remove this test; it is already included in TestOGCGeometryCollection#testUnionPoint

mbasmanova · 2018-06-14T01:30:02Z

src/test/java/com/esri/core/geometry/TestOGC.java

+	}
+
+	@Test
+	public void testUnionPointWithLinestring() {


let's remove this test; it is already included in TestOGCGeometryCollection#testUnionPoint

mbasmanova · 2018-06-14T01:31:04Z

src/test/java/com/esri/core/geometry/TestOGC.java

+	}
+
+	@Test
+	public void testUnionLinestringWithEmptyPolygon() {


let's move this to TestOGCGeometryCollection#testUnionLineString

mbasmanova · 2018-06-14T01:31:18Z

src/test/java/com/esri/core/geometry/TestOGC.java

+	}
+
+	@Test
+	public void testUnionLinestringWithPolygon() {


let's move this to TestOGCGeometryCollection#testUnionLineString

mbasmanova · 2018-06-14T01:32:02Z

src/test/java/com/esri/core/geometry/TestOGC.java

+	}
+
+	@Test
+	public void testUnionGeometryCollectionWithGeometryCollection() {


let's move this to TestOGCGeometryCollection

mbasmanova · 2018-06-14T01:33:28Z

src/test/java/com/esri/core/geometry/TestOGC.java

+	}
+
+	@Test
+	public void testContainsOnGeometryCollection() {


let's move this to TestOGCContains

mbasmanova · 2018-06-14T01:34:16Z

src/test/java/com/esri/core/geometry/TestOGC.java

+	}
+
+	@Test
+	public void testDistanceOnGeometryCollection() {


let's move this to TestOGCDistance

mbasmanova · 2018-06-14T01:35:02Z

src/test/java/com/esri/core/geometry/TestOGC.java


+	@Test
+	public void testFlattened() {


let's move this to TestOGCGeometryCollectionFlatten

mbasmanova · 2018-06-14T01:35:41Z

src/test/java/com/esri/core/geometry/TestOGCGeometryCollection.java

+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestOGCGeometryCollection {


let's rename this class to TestOGCUnion to match other test classes

mbasmanova · 2018-06-14T01:36:31Z

src/test/java/com/esri/core/geometry/TestOGCGeometryCollection.java

+
+public class TestOGCGeometryCollection {
+	@Test
+	public void testUnionPoint() {


let's drop Union from method names and rely on the class name TestOGCUnion to provide the necessary context

randallwhitman

I defer to Sergey and Maria.

satol added 3 commits May 27, 2018 22:50

Adding collection handling methods

e3e0d6e

Fixed distance

91a0bda

added missing file

13c1fa3

mbasmanova reviewed May 29, 2018

View reviewed changes

mbasmanova mentioned this pull request May 30, 2018

OGCGeometry#union of geometries of different dimensions is incorrect #177

Closed

mbasmanova reviewed May 30, 2018

View reviewed changes

satol added 2 commits May 29, 2018 18:38

Fixed a couple of review comments

559fe2f

a few fixes, added intersection and difference for collections

0618e30

mbasmanova reviewed May 30, 2018

View reviewed changes

Equals for collection, reducFromMulti

af34eaf

satol added 2 commits June 3, 2018 17:28

update some comments

aefd7d7

comment out unused code

b06e579

mbasmanova suggested changes Jun 4, 2018

View reviewed changes

stolstov added 2 commits June 4, 2018 20:36

reflect review comments. fix formatting in a test

c47a0e4

fix a typo in disjoint and a test

873d073

mbasmanova reviewed Jun 7, 2018

View reviewed changes

stolstov and others added 5 commits June 7, 2018 08:16

Reflect review comments, throw from unsupported methods

7e19e6f

Added a test from @mbasmanova

104c2ef

Fix OGCCollection#reduceFromMulti and add test

7030d57

Add tests for distance and flatten

40b324e

Simplify intersection and difference

8c20f1d

mbasmanova and others added 4 commits June 8, 2018 01:10

Block overlaps and symDifference for geometry collections

7b2bc6a

Merge pull request #2 from stolstov/geometry-collections

b0b407e

Various fixes and TODOs

Merge pull request #1 from stolstov/ogc_fixes

c5fb343

Ogc fixes

Merge pull request #180 from stolstov/stolstov/collection_methods

e1cbb52

Stolstov/collection methods

mbasmanova approved these changes Jun 14, 2018

View reviewed changes

randallwhitman reviewed Jun 21, 2018

View reviewed changes

stolstov merged commit ecaedf4 into master Jun 21, 2018

stolstov deleted the stolstov/collection_methods branch June 21, 2018 20:45

		import java.util.List;

		import com.esri.core.geometry.ogc.OGCConcreteGeometryCollection;


		};

		public static GeometryCursor prepare_for_ops_(GeometryCursor geoms, SpatialReference sr) {

Stolstov/collection methods #178

Stolstov/collection methods #178

Conversation

stolstov commented May 28, 2018 • edited Loading

mbasmanova left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

stolstov commented May 29, 2018

mbasmanova May 29, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

stolstov commented May 29, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mbasmanova commented Jun 1, 2018

stolstov commented Jun 1, 2018

stolstov commented Jun 2, 2018 • edited Loading

stolstov commented Jun 4, 2018

mbasmanova left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mbasmanova Jun 7, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mbasmanova commented Jun 7, 2018

mbasmanova commented Jun 13, 2018

stolstov commented Jun 13, 2018

mbasmanova left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

stolstov commented May 28, 2018 •

edited

Loading

mbasmanova May 29, 2018 •

edited

Loading

stolstov commented Jun 2, 2018 •

edited

Loading

mbasmanova Jun 7, 2018 •

edited

Loading