You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2016/05/14 17:21:59 UTC
[03/40] jena git commit: Fix line endings
http://git-wip-us.apache.org/repos/asf/jena/blob/d6ae87fd/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/IntersectsBoxPF.java
----------------------------------------------------------------------
diff --git a/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/IntersectsBoxPF.java b/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/IntersectsBoxPF.java
index 8d6b426..d71f050 100644
--- a/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/IntersectsBoxPF.java
+++ b/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/IntersectsBoxPF.java
@@ -1,35 +1,35 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jena.query.spatial.pfunction.library;
-
-import org.apache.jena.query.spatial.pfunction.SpatialOperationWithBoxPFBase;
-import org.apache.lucene.spatial.query.SpatialOperation;
-
-public class IntersectsBoxPF extends SpatialOperationWithBoxPFBase {
-
- public IntersectsBoxPF() {
- }
-
-
- @Override
- protected SpatialOperation getSpatialOperation() {
- return SpatialOperation.Intersects;
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.query.spatial.pfunction.library;
+
+import org.apache.jena.query.spatial.pfunction.SpatialOperationWithBoxPFBase;
+import org.apache.lucene.spatial.query.SpatialOperation;
+
+public class IntersectsBoxPF extends SpatialOperationWithBoxPFBase {
+
+ public IntersectsBoxPF() {
+ }
+
+
+ @Override
+ protected SpatialOperation getSpatialOperation() {
+ return SpatialOperation.Intersects;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/jena/blob/d6ae87fd/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/IsNearByPF.java
----------------------------------------------------------------------
diff --git a/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/IsNearByPF.java b/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/IsNearByPF.java
index 75df1d1..a5a44d4 100644
--- a/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/IsNearByPF.java
+++ b/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/IsNearByPF.java
@@ -1,23 +1,23 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jena.query.spatial.pfunction.library;
-
-public class IsNearByPF extends IsWithinCirclePF {
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.query.spatial.pfunction.library;
+
+public class IsNearByPF extends IsWithinCirclePF {
+
+}
http://git-wip-us.apache.org/repos/asf/jena/blob/d6ae87fd/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/IsWithinBoxPF.java
----------------------------------------------------------------------
diff --git a/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/IsWithinBoxPF.java b/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/IsWithinBoxPF.java
index 048d0b2..078bd10 100644
--- a/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/IsWithinBoxPF.java
+++ b/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/IsWithinBoxPF.java
@@ -1,34 +1,34 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jena.query.spatial.pfunction.library;
-
-import org.apache.jena.query.spatial.pfunction.SpatialOperationWithBoxPFBase;
-import org.apache.lucene.spatial.query.SpatialOperation;
-
-public class IsWithinBoxPF extends SpatialOperationWithBoxPFBase {
-
- public IsWithinBoxPF() {
- }
-
- @Override
- protected SpatialOperation getSpatialOperation() {
- return SpatialOperation.IsWithin;
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.query.spatial.pfunction.library;
+
+import org.apache.jena.query.spatial.pfunction.SpatialOperationWithBoxPFBase;
+import org.apache.lucene.spatial.query.SpatialOperation;
+
+public class IsWithinBoxPF extends SpatialOperationWithBoxPFBase {
+
+ public IsWithinBoxPF() {
+ }
+
+ @Override
+ protected SpatialOperation getSpatialOperation() {
+ return SpatialOperation.IsWithin;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/jena/blob/d6ae87fd/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/IsWithinCirclePF.java
----------------------------------------------------------------------
diff --git a/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/IsWithinCirclePF.java b/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/IsWithinCirclePF.java
index 322e442..c10c4e2 100644
--- a/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/IsWithinCirclePF.java
+++ b/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/IsWithinCirclePF.java
@@ -1,35 +1,35 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jena.query.spatial.pfunction.library;
-
-import org.apache.jena.query.spatial.pfunction.SpatialOperationWithCircleBase;
-import org.apache.lucene.spatial.query.SpatialOperation;
-
-public class IsWithinCirclePF extends SpatialOperationWithCircleBase {
-
- public IsWithinCirclePF() {
- // TODO Auto-generated constructor stub
- }
-
- @Override
- protected SpatialOperation getSpatialOperation() {
- return SpatialOperation.IsWithin;
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.query.spatial.pfunction.library;
+
+import org.apache.jena.query.spatial.pfunction.SpatialOperationWithCircleBase;
+import org.apache.lucene.spatial.query.SpatialOperation;
+
+public class IsWithinCirclePF extends SpatialOperationWithCircleBase {
+
+ public IsWithinCirclePF() {
+ // TODO Auto-generated constructor stub
+ }
+
+ @Override
+ protected SpatialOperation getSpatialOperation() {
+ return SpatialOperation.IsWithin;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/jena/blob/d6ae87fd/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/NorthPF.java
----------------------------------------------------------------------
diff --git a/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/NorthPF.java b/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/NorthPF.java
index 9576fe3..e2cfbb1 100644
--- a/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/NorthPF.java
+++ b/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/NorthPF.java
@@ -1,45 +1,45 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jena.query.spatial.pfunction.library;
-
-import org.apache.jena.query.spatial.SpatialQuery;
-import org.apache.jena.query.spatial.pfunction.DirectionWithPointPFBase;
-import org.apache.jena.query.spatial.pfunction.SpatialMatch;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class NorthPF extends DirectionWithPointPFBase {
-
- private static Logger log = LoggerFactory.getLogger(NorthPF.class);
-
- public NorthPF() {
- // TODO Auto-generated constructor stub
- }
-
- /** Deconstruct the node or list object argument and make a SpatialMatch */
- @Override
- protected SpatialMatch getSpatialMatch(Double latitude, Double longitude, int limit) {
- SpatialMatch match = new SpatialMatch(latitude, SpatialQuery.ctx
- .getWorldBounds().getMinX(), SpatialQuery.ctx.getWorldBounds()
- .getMaxY(), SpatialQuery.ctx.getWorldBounds().getMaxX(), limit,
- getSpatialOperation());
- return match;
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.query.spatial.pfunction.library;
+
+import org.apache.jena.query.spatial.SpatialQuery;
+import org.apache.jena.query.spatial.pfunction.DirectionWithPointPFBase;
+import org.apache.jena.query.spatial.pfunction.SpatialMatch;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class NorthPF extends DirectionWithPointPFBase {
+
+ private static Logger log = LoggerFactory.getLogger(NorthPF.class);
+
+ public NorthPF() {
+ // TODO Auto-generated constructor stub
+ }
+
+ /** Deconstruct the node or list object argument and make a SpatialMatch */
+ @Override
+ protected SpatialMatch getSpatialMatch(Double latitude, Double longitude, int limit) {
+ SpatialMatch match = new SpatialMatch(latitude, SpatialQuery.ctx
+ .getWorldBounds().getMinX(), SpatialQuery.ctx.getWorldBounds()
+ .getMaxY(), SpatialQuery.ctx.getWorldBounds().getMaxX(), limit,
+ getSpatialOperation());
+ return match;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/jena/blob/d6ae87fd/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/SouthPF.java
----------------------------------------------------------------------
diff --git a/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/SouthPF.java b/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/SouthPF.java
index cf8a467..431531b 100644
--- a/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/SouthPF.java
+++ b/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/SouthPF.java
@@ -1,43 +1,43 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jena.query.spatial.pfunction.library;
-
-import org.apache.jena.query.spatial.SpatialQuery;
-import org.apache.jena.query.spatial.pfunction.DirectionWithPointPFBase;
-import org.apache.jena.query.spatial.pfunction.SpatialMatch;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class SouthPF extends DirectionWithPointPFBase {
-
- private static Logger log = LoggerFactory.getLogger(SouthPF.class);
-
- public SouthPF() {
- // TODO Auto-generated constructor stub
- }
-
- /** Deconstruct the node or list object argument and make a SpatialMatch */
- @Override
- protected SpatialMatch getSpatialMatch(Double latitude, Double longitude, int limit) { SpatialMatch match = new SpatialMatch(SpatialQuery.ctx.getWorldBounds().getMinY(),
- SpatialQuery.ctx.getWorldBounds().getMinX(), latitude, SpatialQuery.ctx.getWorldBounds()
- .getMaxX(), limit, getSpatialOperation());
- return match;
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.query.spatial.pfunction.library;
+
+import org.apache.jena.query.spatial.SpatialQuery;
+import org.apache.jena.query.spatial.pfunction.DirectionWithPointPFBase;
+import org.apache.jena.query.spatial.pfunction.SpatialMatch;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SouthPF extends DirectionWithPointPFBase {
+
+ private static Logger log = LoggerFactory.getLogger(SouthPF.class);
+
+ public SouthPF() {
+ // TODO Auto-generated constructor stub
+ }
+
+ /** Deconstruct the node or list object argument and make a SpatialMatch */
+ @Override
+ protected SpatialMatch getSpatialMatch(Double latitude, Double longitude, int limit) { SpatialMatch match = new SpatialMatch(SpatialQuery.ctx.getWorldBounds().getMinY(),
+ SpatialQuery.ctx.getWorldBounds().getMinX(), latitude, SpatialQuery.ctx.getWorldBounds()
+ .getMaxX(), limit, getSpatialOperation());
+ return match;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/jena/blob/d6ae87fd/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/WestPF.java
----------------------------------------------------------------------
diff --git a/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/WestPF.java b/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/WestPF.java
index 5b3f568..9ddf6b7 100644
--- a/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/WestPF.java
+++ b/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/WestPF.java
@@ -1,44 +1,44 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jena.query.spatial.pfunction.library;
-
-import org.apache.jena.query.spatial.SpatialQuery;
-import org.apache.jena.query.spatial.pfunction.DirectionWithPointPFBase;
-import org.apache.jena.query.spatial.pfunction.SpatialMatch;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class WestPF extends DirectionWithPointPFBase {
-
- private static Logger log = LoggerFactory.getLogger(WestPF.class);
-
- public WestPF() {
- // TODO Auto-generated constructor stub
- }
-
- /** Deconstruct the node or list object argument and make a SpatialMatch */
- @Override
- protected SpatialMatch getSpatialMatch(Double latitude, Double longitude, int limit) {
- SpatialMatch match = new SpatialMatch(SpatialQuery.ctx.getWorldBounds().getMinY(),
- SpatialQuery.ctx.getWorldBounds().getMinX(), SpatialQuery.ctx.getWorldBounds().getMaxY(),
- longitude, limit, getSpatialOperation());
- return match;
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.query.spatial.pfunction.library;
+
+import org.apache.jena.query.spatial.SpatialQuery;
+import org.apache.jena.query.spatial.pfunction.DirectionWithPointPFBase;
+import org.apache.jena.query.spatial.pfunction.SpatialMatch;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class WestPF extends DirectionWithPointPFBase {
+
+ private static Logger log = LoggerFactory.getLogger(WestPF.class);
+
+ public WestPF() {
+ // TODO Auto-generated constructor stub
+ }
+
+ /** Deconstruct the node or list object argument and make a SpatialMatch */
+ @Override
+ protected SpatialMatch getSpatialMatch(Double latitude, Double longitude, int limit) {
+ SpatialMatch match = new SpatialMatch(SpatialQuery.ctx.getWorldBounds().getMinY(),
+ SpatialQuery.ctx.getWorldBounds().getMinX(), SpatialQuery.ctx.getWorldBounds().getMaxY(),
+ longitude, limit, getSpatialOperation());
+ return match;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/jena/blob/d6ae87fd/jena-spatial/src/test/java/org/apache/jena/query/spatial/AbstractTestIndexingSpatialData.java
----------------------------------------------------------------------
diff --git a/jena-spatial/src/test/java/org/apache/jena/query/spatial/AbstractTestIndexingSpatialData.java b/jena-spatial/src/test/java/org/apache/jena/query/spatial/AbstractTestIndexingSpatialData.java
index 0780961..3fdeaca 100644
--- a/jena-spatial/src/test/java/org/apache/jena/query/spatial/AbstractTestIndexingSpatialData.java
+++ b/jena-spatial/src/test/java/org/apache/jena/query/spatial/AbstractTestIndexingSpatialData.java
@@ -1,93 +1,93 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jena.query.spatial;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.jena.atlas.lib.StrUtils;
-import org.junit.Test;
-import static org.junit.Assert.fail;
-
-import com.spatial4j.core.exception.InvalidShapeException;
-
-public class AbstractTestIndexingSpatialData extends
- AbstractTestDatasetWithSpatialIndex {
-
- @Test
- public void testIndexingStringLiteral() {
- final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
- + RESOURCE_BASE + "testIndexingStringLiteral>",
- " geo:lat '51.3827' ;", " geo:long '-2.71909' ", ".");
- String queryString = StrUtils
- .strjoinNL(
- QUERY_PROLOG,
- "SELECT ?s",
- "WHERE {",
- " ?s spatial:nearby (51.3000 -2.71000 100.0 'miles' -1) .",
- "}");
- Set<String> expectedURIs = (new HashSet<String>());
- expectedURIs
- .addAll(Arrays
- .asList((new String[] { "http://example.org/data/resource/testIndexingStringLiteral" })));
- doTestSearch(turtle, queryString, expectedURIs);
- }
-
- @Test
- public void testIndexingWKTLiteral() {
- boolean jts_context_ready = false;
- try {
- SpatialIndex index = (SpatialIndex) dataset.getContext().get(
- SpatialQuery.spatialIndex);
- index.getDocDef().setSpatialContextFactory(
- SpatialQuery.JTS_SPATIAL_CONTEXT_FACTORY_CLASS);
- jts_context_ready = true;
- }catch (NoClassDefFoundError e){
- //Log.warn(this, "JTS lib is not on the classpath!");
- }
-
- final String turtle = StrUtils
- .strjoinNL(
- TURTLE_PROLOG,
- "<" + RESOURCE_BASE + "testIndexingWKTLiteral>",
- " wkt:asWKT 'POINT(-1.74803 52.4539)'^^wkt:wktLiteral ",
- ".");
- String queryString = StrUtils
- .strjoinNL(
- QUERY_PROLOG,
- "SELECT ?s",
- "WHERE {",
- " ?s spatial:nearby (51.3000 -2.71000 100.0 'miles' -1) .",
- "}");
- Set<String> expectedURIs = (new HashSet<String>());
- expectedURIs
- .addAll(Arrays
- .asList((new String[] { "http://example.org/data/resource/testIndexingWKTLiteral" })));
-
- try {
- doTestSearch(turtle, queryString, expectedURIs);
- }catch (InvalidShapeException e){
- if (jts_context_ready){
- fail("The exception is not supposed to be thrown: "+ e.getMessage());
- }
- }
- }
-
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.query.spatial;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.jena.atlas.lib.StrUtils;
+import org.junit.Test;
+import static org.junit.Assert.fail;
+
+import com.spatial4j.core.exception.InvalidShapeException;
+
+public class AbstractTestIndexingSpatialData extends
+ AbstractTestDatasetWithSpatialIndex {
+
+ @Test
+ public void testIndexingStringLiteral() {
+ final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
+ + RESOURCE_BASE + "testIndexingStringLiteral>",
+ " geo:lat '51.3827' ;", " geo:long '-2.71909' ", ".");
+ String queryString = StrUtils
+ .strjoinNL(
+ QUERY_PROLOG,
+ "SELECT ?s",
+ "WHERE {",
+ " ?s spatial:nearby (51.3000 -2.71000 100.0 'miles' -1) .",
+ "}");
+ Set<String> expectedURIs = (new HashSet<String>());
+ expectedURIs
+ .addAll(Arrays
+ .asList((new String[] { "http://example.org/data/resource/testIndexingStringLiteral" })));
+ doTestSearch(turtle, queryString, expectedURIs);
+ }
+
+ @Test
+ public void testIndexingWKTLiteral() {
+ boolean jts_context_ready = false;
+ try {
+ SpatialIndex index = (SpatialIndex) dataset.getContext().get(
+ SpatialQuery.spatialIndex);
+ index.getDocDef().setSpatialContextFactory(
+ SpatialQuery.JTS_SPATIAL_CONTEXT_FACTORY_CLASS);
+ jts_context_ready = true;
+ }catch (NoClassDefFoundError e){
+ //Log.warn(this, "JTS lib is not on the classpath!");
+ }
+
+ final String turtle = StrUtils
+ .strjoinNL(
+ TURTLE_PROLOG,
+ "<" + RESOURCE_BASE + "testIndexingWKTLiteral>",
+ " wkt:asWKT 'POINT(-1.74803 52.4539)'^^wkt:wktLiteral ",
+ ".");
+ String queryString = StrUtils
+ .strjoinNL(
+ QUERY_PROLOG,
+ "SELECT ?s",
+ "WHERE {",
+ " ?s spatial:nearby (51.3000 -2.71000 100.0 'miles' -1) .",
+ "}");
+ Set<String> expectedURIs = (new HashSet<String>());
+ expectedURIs
+ .addAll(Arrays
+ .asList((new String[] { "http://example.org/data/resource/testIndexingWKTLiteral" })));
+
+ try {
+ doTestSearch(turtle, queryString, expectedURIs);
+ }catch (InvalidShapeException e){
+ if (jts_context_ready){
+ fail("The exception is not supposed to be thrown: "+ e.getMessage());
+ }
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/jena/blob/d6ae87fd/jena-spatial/src/test/java/org/apache/jena/query/spatial/TestIndexingSpatialDataWithLucene.java
----------------------------------------------------------------------
diff --git a/jena-spatial/src/test/java/org/apache/jena/query/spatial/TestIndexingSpatialDataWithLucene.java b/jena-spatial/src/test/java/org/apache/jena/query/spatial/TestIndexingSpatialDataWithLucene.java
index 1a1a2bf..af3ad7a 100644
--- a/jena-spatial/src/test/java/org/apache/jena/query/spatial/TestIndexingSpatialDataWithLucene.java
+++ b/jena-spatial/src/test/java/org/apache/jena/query/spatial/TestIndexingSpatialDataWithLucene.java
@@ -1,42 +1,42 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jena.query.spatial;
-
-import java.io.File;
-import java.io.IOException;
-import org.junit.After;
-import org.junit.Before;
-
-public class TestIndexingSpatialDataWithLucene extends
- AbstractTestIndexingSpatialData {
- private static final String INDEX_PATH = "target/test/IsNearByPFWithLuceneSpatialIndex";
- private static final File INDEX_DIR = new File(INDEX_PATH);
-
- @Before
- public void init() throws IOException {
- dataset = SpatialSearchUtil
- .initInMemoryDatasetWithLuceneSpatitalIndex(INDEX_DIR);
- }
-
- @After
- public void destroy() {
- SpatialSearchUtil.deleteOldFiles(INDEX_DIR);
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.query.spatial;
+
+import java.io.File;
+import java.io.IOException;
+import org.junit.After;
+import org.junit.Before;
+
+public class TestIndexingSpatialDataWithLucene extends
+ AbstractTestIndexingSpatialData {
+ private static final String INDEX_PATH = "target/test/IsNearByPFWithLuceneSpatialIndex";
+ private static final File INDEX_DIR = new File(INDEX_PATH);
+
+ @Before
+ public void init() throws IOException {
+ dataset = SpatialSearchUtil
+ .initInMemoryDatasetWithLuceneSpatitalIndex(INDEX_DIR);
+ }
+
+ @After
+ public void destroy() {
+ SpatialSearchUtil.deleteOldFiles(INDEX_DIR);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/jena/blob/d6ae87fd/jena-spatial/src/test/java/org/apache/jena/query/spatial/TestIndexingSpatialDataWithSolr.java
----------------------------------------------------------------------
diff --git a/jena-spatial/src/test/java/org/apache/jena/query/spatial/TestIndexingSpatialDataWithSolr.java b/jena-spatial/src/test/java/org/apache/jena/query/spatial/TestIndexingSpatialDataWithSolr.java
index 3a94f55..d3f70cd 100644
--- a/jena-spatial/src/test/java/org/apache/jena/query/spatial/TestIndexingSpatialDataWithSolr.java
+++ b/jena-spatial/src/test/java/org/apache/jena/query/spatial/TestIndexingSpatialDataWithSolr.java
@@ -1,40 +1,40 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jena.query.spatial;
-
-import org.junit.After;
-import org.junit.Before;
-
-public class TestIndexingSpatialDataWithSolr extends
- AbstractTestIndexingSpatialData {
-
- @Before
- public void init() {
- dataset = SpatialSearchUtil.initInMemoryDatasetWithSolrSpatitalIndex();
- }
-
- @After
- public void destroy() {
- SpatialIndexSolr index = (SpatialIndexSolr) dataset.getContext().get(
- SpatialQuery.spatialIndex);
- index.getServer().shutdown();
- SpatialSearchUtil.deleteOldSolrDataDir();
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.query.spatial;
+
+import org.junit.After;
+import org.junit.Before;
+
+public class TestIndexingSpatialDataWithSolr extends
+ AbstractTestIndexingSpatialData {
+
+ @Before
+ public void init() {
+ dataset = SpatialSearchUtil.initInMemoryDatasetWithSolrSpatitalIndex();
+ }
+
+ @After
+ public void destroy() {
+ SpatialIndexSolr index = (SpatialIndexSolr) dataset.getContext().get(
+ SpatialQuery.spatialIndex);
+ index.getServer().shutdown();
+ SpatialSearchUtil.deleteOldSolrDataDir();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/jena/blob/d6ae87fd/jena-spatial/src/test/java/org/apache/jena/query/spatial/TestSpatialPredicatePairValue.java
----------------------------------------------------------------------
diff --git a/jena-spatial/src/test/java/org/apache/jena/query/spatial/TestSpatialPredicatePairValue.java b/jena-spatial/src/test/java/org/apache/jena/query/spatial/TestSpatialPredicatePairValue.java
index 6e01f71..e98f459 100644
--- a/jena-spatial/src/test/java/org/apache/jena/query/spatial/TestSpatialPredicatePairValue.java
+++ b/jena-spatial/src/test/java/org/apache/jena/query/spatial/TestSpatialPredicatePairValue.java
@@ -1,59 +1,59 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jena.query.spatial;
-
-import junit.framework.TestCase;
-
-import org.junit.Test;
-
-public class TestSpatialPredicatePairValue {
-
- @Test public void testEqualsAndHashcode(){
- SpatialPredicatePair pair1 = new SpatialPredicatePair(
- EntityDefinition.geo_latitude.asNode(),
- EntityDefinition.geo_longitude.asNode());
- SpatialPredicatePair pair2 = new SpatialPredicatePair(
- EntityDefinition.geo_latitude.asNode(),
- EntityDefinition.geo_longitude.asNode());
- TestCase.assertTrue(pair1.equals(pair2));
- TestCase.assertTrue(pair1.hashCode() == pair2.hashCode());
-
- SpatialPredicatePairValue value1 = new SpatialPredicatePairValue(pair1);
- value1.setValue(EntityDefinition.geo_latitude.asNode(), 12.0);
- value1.setValue(EntityDefinition.geo_longitude.asNode(), 23.0);
-
- SpatialPredicatePairValue value2 = new SpatialPredicatePairValue(pair2);
- value2.setValue(EntityDefinition.geo_latitude.asNode(), 12.0);
- value2.setValue(EntityDefinition.geo_longitude.asNode(), 23.0);
-
- TestCase.assertTrue(value1.equals(value2));
- TestCase.assertTrue(value1.hashCode() == value2.hashCode());
-
- value1.setValue(EntityDefinition.geo_latitude.asNode(),null);
- value2.setValue(EntityDefinition.geo_latitude.asNode(),null);
-
- TestCase.assertTrue(value1.equals(value2));
- TestCase.assertTrue(value1.hashCode() == value2.hashCode());
-
- value2.setValue(EntityDefinition.geo_latitude.asNode(),23.0);
- TestCase.assertFalse(value1.equals(value2));
- TestCase.assertFalse(value1.hashCode() == value2.hashCode());
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.query.spatial;
+
+import junit.framework.TestCase;
+
+import org.junit.Test;
+
+public class TestSpatialPredicatePairValue {
+
+ @Test public void testEqualsAndHashcode(){
+ SpatialPredicatePair pair1 = new SpatialPredicatePair(
+ EntityDefinition.geo_latitude.asNode(),
+ EntityDefinition.geo_longitude.asNode());
+ SpatialPredicatePair pair2 = new SpatialPredicatePair(
+ EntityDefinition.geo_latitude.asNode(),
+ EntityDefinition.geo_longitude.asNode());
+ TestCase.assertTrue(pair1.equals(pair2));
+ TestCase.assertTrue(pair1.hashCode() == pair2.hashCode());
+
+ SpatialPredicatePairValue value1 = new SpatialPredicatePairValue(pair1);
+ value1.setValue(EntityDefinition.geo_latitude.asNode(), 12.0);
+ value1.setValue(EntityDefinition.geo_longitude.asNode(), 23.0);
+
+ SpatialPredicatePairValue value2 = new SpatialPredicatePairValue(pair2);
+ value2.setValue(EntityDefinition.geo_latitude.asNode(), 12.0);
+ value2.setValue(EntityDefinition.geo_longitude.asNode(), 23.0);
+
+ TestCase.assertTrue(value1.equals(value2));
+ TestCase.assertTrue(value1.hashCode() == value2.hashCode());
+
+ value1.setValue(EntityDefinition.geo_latitude.asNode(),null);
+ value2.setValue(EntityDefinition.geo_latitude.asNode(),null);
+
+ TestCase.assertTrue(value1.equals(value2));
+ TestCase.assertTrue(value1.hashCode() == value2.hashCode());
+
+ value2.setValue(EntityDefinition.geo_latitude.asNode(),23.0);
+ TestCase.assertFalse(value1.equals(value2));
+ TestCase.assertFalse(value1.hashCode() == value2.hashCode());
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/jena/blob/d6ae87fd/jena-spatial/src/test/java/org/apache/jena/query/spatial/TestTDBDatasetWithLuceneSpatialIndex.java
----------------------------------------------------------------------
diff --git a/jena-spatial/src/test/java/org/apache/jena/query/spatial/TestTDBDatasetWithLuceneSpatialIndex.java b/jena-spatial/src/test/java/org/apache/jena/query/spatial/TestTDBDatasetWithLuceneSpatialIndex.java
index 6e943e5..485a081 100644
--- a/jena-spatial/src/test/java/org/apache/jena/query/spatial/TestTDBDatasetWithLuceneSpatialIndex.java
+++ b/jena-spatial/src/test/java/org/apache/jena/query/spatial/TestTDBDatasetWithLuceneSpatialIndex.java
@@ -1,95 +1,95 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jena.query.spatial;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.jena.atlas.lib.StrUtils;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-public class TestTDBDatasetWithLuceneSpatialIndex extends
- AbstractTestDatasetWithSpatialIndex {
-
- private static final String INDEX_PATH = "target/test/TBDDatasetWithLuceneSpatialIndex";
- private static final File INDEX_DIR = new File(INDEX_PATH);
- private static final String TDB_PATH = "target/test/TDB";
- private static final File TDB_DIR = new File(TDB_PATH);
-
- @Before
- public void init() throws IOException {
- dataset = SpatialSearchUtil.initTDBDatasetWithLuceneSpatitalIndex(
- INDEX_DIR, TDB_DIR);
- }
-
- @After
- public void destroy() {
- SpatialSearchUtil.deleteOldFiles(INDEX_DIR);
- SpatialSearchUtil.deleteOldFiles(TDB_DIR);
- }
-
- @Test
- public void testOneSimpleResult() {
- final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
- + RESOURCE_BASE + "testOneSimpleResult>",
- " geo:lat '51.3827'^^xsd:float ;",
- " geo:long '-2.71909'^^xsd:float ", ".");
- String queryString = StrUtils
- .strjoinNL(
- QUERY_PROLOG,
- "SELECT ?s",
- "WHERE {",
- " ?s spatial:nearby (51.3000 -2.71000 100.0 'miles' -1) .",
- "}");
- Set<String> expectedURIs = (new HashSet<String>());
- expectedURIs
- .addAll(Arrays
- .asList((new String[] { "http://example.org/data/resource/testOneSimpleResult" })));
- doTestSearch(turtle, queryString, expectedURIs);
- }
-
- @Test
- public void testMultipleResults() {
- String label = "testMultipleResults";
- final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
- + RESOURCE_BASE + label + "1>",
- " geo:lat '51.3827'^^xsd:float ;",
- " geo:long '-2.71909'^^xsd:float ;", ".", "<" + RESOURCE_BASE
- + label + "2>", " geo:lat '51.3967'^^xsd:float ;",
- " geo:long '-3.34333'^^xsd:float ;", ".");
-
- String queryString = StrUtils
- .strjoinNL(
- QUERY_PROLOG,
- "SELECT ?s",
- "WHERE {",
- " ?s spatial:nearby (51.3000 -2.71000 100.0 'miles' -1) .",
- "}");
- Set<String> expectedURIs = (new HashSet<String>());
- expectedURIs.addAll(Arrays.asList((new String[] {
- "http://example.org/data/resource/" + label + "1",
- "http://example.org/data/resource/" + label + "2" })));
- doTestSearch(turtle, queryString, expectedURIs);
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.query.spatial;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.jena.atlas.lib.StrUtils;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class TestTDBDatasetWithLuceneSpatialIndex extends
+ AbstractTestDatasetWithSpatialIndex {
+
+ private static final String INDEX_PATH = "target/test/TBDDatasetWithLuceneSpatialIndex";
+ private static final File INDEX_DIR = new File(INDEX_PATH);
+ private static final String TDB_PATH = "target/test/TDB";
+ private static final File TDB_DIR = new File(TDB_PATH);
+
+ @Before
+ public void init() throws IOException {
+ dataset = SpatialSearchUtil.initTDBDatasetWithLuceneSpatitalIndex(
+ INDEX_DIR, TDB_DIR);
+ }
+
+ @After
+ public void destroy() {
+ SpatialSearchUtil.deleteOldFiles(INDEX_DIR);
+ SpatialSearchUtil.deleteOldFiles(TDB_DIR);
+ }
+
+ @Test
+ public void testOneSimpleResult() {
+ final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
+ + RESOURCE_BASE + "testOneSimpleResult>",
+ " geo:lat '51.3827'^^xsd:float ;",
+ " geo:long '-2.71909'^^xsd:float ", ".");
+ String queryString = StrUtils
+ .strjoinNL(
+ QUERY_PROLOG,
+ "SELECT ?s",
+ "WHERE {",
+ " ?s spatial:nearby (51.3000 -2.71000 100.0 'miles' -1) .",
+ "}");
+ Set<String> expectedURIs = (new HashSet<String>());
+ expectedURIs
+ .addAll(Arrays
+ .asList((new String[] { "http://example.org/data/resource/testOneSimpleResult" })));
+ doTestSearch(turtle, queryString, expectedURIs);
+ }
+
+ @Test
+ public void testMultipleResults() {
+ String label = "testMultipleResults";
+ final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
+ + RESOURCE_BASE + label + "1>",
+ " geo:lat '51.3827'^^xsd:float ;",
+ " geo:long '-2.71909'^^xsd:float ;", ".", "<" + RESOURCE_BASE
+ + label + "2>", " geo:lat '51.3967'^^xsd:float ;",
+ " geo:long '-3.34333'^^xsd:float ;", ".");
+
+ String queryString = StrUtils
+ .strjoinNL(
+ QUERY_PROLOG,
+ "SELECT ?s",
+ "WHERE {",
+ " ?s spatial:nearby (51.3000 -2.71000 100.0 'miles' -1) .",
+ "}");
+ Set<String> expectedURIs = (new HashSet<String>());
+ expectedURIs.addAll(Arrays.asList((new String[] {
+ "http://example.org/data/resource/" + label + "1",
+ "http://example.org/data/resource/" + label + "2" })));
+ doTestSearch(turtle, queryString, expectedURIs);
+ }
+}
http://git-wip-us.apache.org/repos/asf/jena/blob/d6ae87fd/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestEastPF.java
----------------------------------------------------------------------
diff --git a/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestEastPF.java b/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestEastPF.java
index 9ef30ea..35b634b 100644
--- a/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestEastPF.java
+++ b/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestEastPF.java
@@ -1,142 +1,142 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jena.query.spatial.pfunction;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.jena.atlas.lib.StrUtils;
-import org.apache.jena.query.spatial.AbstractTestDatasetWithSpatialIndex;
-import org.junit.Test;
-
-public abstract class AbstractTestEastPF extends AbstractTestDatasetWithSpatialIndex {
-
- @Test
- public void testOneSimpleResult() {
- final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
- + RESOURCE_BASE + "testOneSimpleResult>",
- " geo:lat '51.885'^^xsd:float ;",
- " geo:long '0.235'^^xsd:float ", ".");
- String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
- "WHERE {",
- " ?s spatial:east (51.3000 0.0000 -1) .", "}");
- Set<String> expectedURIs = (new HashSet<String>());
- expectedURIs
- .addAll(Arrays
- .asList((new String[] { "http://example.org/data/resource/testOneSimpleResult" })));
- doTestSearch(turtle, queryString, expectedURIs);
- }
-
- @Test
- public void testMultipleResults() {
- String label = "testMultipleResults";
- final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
- + RESOURCE_BASE + label + "1>",
- " geo:lat '51.885'^^xsd:float ;",
- " geo:long '0.234'^^xsd:float ", ".",
- "<" + RESOURCE_BASE + label + "2>",
- " geo:lat '51.1234'^^xsd:float ;",
- " geo:long '1.234'^^xsd:float ;", ".");
-
- String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
- "WHERE {",
- " ?s spatial:east (51.3000 0.0000 -1) .", "}");
- Set<String> expectedURIs = (new HashSet<String>());
- expectedURIs.addAll(Arrays.asList((new String[] {
- "http://example.org/data/resource/" + label + "1",
- "http://example.org/data/resource/" + label + "2" })));
- doTestSearch(turtle, queryString, expectedURIs);
- }
-
- @Test
- public void testArgumentListSize() {
- final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
- + RESOURCE_BASE + "testArgumentListSize>",
- " geo:lat '51.3827'^^xsd:float ;",
- " geo:long '-2.71909'^^xsd:float ", ".");
- String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
- "WHERE {",
- " ?s spatial:east (51.3000) .", "}");
- doTestSearchThrowException(turtle, queryString);
-
- queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
- "WHERE {",
- " ?s spatial:east (51.3000 0.0000 -1 'another argument') .", "}");
- doTestSearchThrowException(turtle, queryString);
- }
-
- @Test
- public void testSearchLimitsResults() {
- String label = "testSearchLimitsResults";
- final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
- + RESOURCE_BASE + label + "1>",
- " geo:lat '51.885'^^xsd:float ;",
- " geo:long '0.234'^^xsd:float ", ".",
- "<" + RESOURCE_BASE + label + "2>",
- " geo:lat '51.1234'^^xsd:float ;",
- " geo:long '1.234'^^xsd:float ;", ".");
- String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
- "WHERE {",
- " ?s spatial:north (51.3000 0.0000 1) .", "}");
- Set<String> expectedURIs = (new HashSet<String>());
- expectedURIs.addAll( Arrays.asList((
- new String[]
- {
- "http://example.org/data/resource/" + label + "1",
- "http://example.org/data/resource/" + label + "2"
- }
- )));
- doTestSearch(turtle, queryString, expectedURIs, 1);
-
-
- queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
- "WHERE {",
- " ?s spatial:east (51.3000 0.0000 -1) .", "}");
- expectedURIs = (new HashSet<String>());
- expectedURIs.addAll( Arrays.asList((
- new String[]
- {
- "http://example.org/data/resource/" + label + "1",
- "http://example.org/data/resource/" + label + "2"
- }
- )));
- doTestSearch(turtle, queryString, expectedURIs);
-
- queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
- "WHERE {",
- " ?s spatial:east (51.3000 0.0000 3) .", "}");
- expectedURIs = (new HashSet<String>());
- expectedURIs.addAll( Arrays.asList((
- new String[]
- {
- "http://example.org/data/resource/" + label + "1",
- "http://example.org/data/resource/" + label + "2"
- }
- )));
- doTestSearch(turtle, queryString, expectedURIs);
-
- queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
- "WHERE {",
- " ?s spatial:east (51.3000 0.0000 'something not an integer') .", "}");
- expectedURIs = (new HashSet<String>());
- doTestSearch(turtle, queryString, expectedURIs);
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.query.spatial.pfunction;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.jena.atlas.lib.StrUtils;
+import org.apache.jena.query.spatial.AbstractTestDatasetWithSpatialIndex;
+import org.junit.Test;
+
+public abstract class AbstractTestEastPF extends AbstractTestDatasetWithSpatialIndex {
+
+ @Test
+ public void testOneSimpleResult() {
+ final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
+ + RESOURCE_BASE + "testOneSimpleResult>",
+ " geo:lat '51.885'^^xsd:float ;",
+ " geo:long '0.235'^^xsd:float ", ".");
+ String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+ "WHERE {",
+ " ?s spatial:east (51.3000 0.0000 -1) .", "}");
+ Set<String> expectedURIs = (new HashSet<String>());
+ expectedURIs
+ .addAll(Arrays
+ .asList((new String[] { "http://example.org/data/resource/testOneSimpleResult" })));
+ doTestSearch(turtle, queryString, expectedURIs);
+ }
+
+ @Test
+ public void testMultipleResults() {
+ String label = "testMultipleResults";
+ final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
+ + RESOURCE_BASE + label + "1>",
+ " geo:lat '51.885'^^xsd:float ;",
+ " geo:long '0.234'^^xsd:float ", ".",
+ "<" + RESOURCE_BASE + label + "2>",
+ " geo:lat '51.1234'^^xsd:float ;",
+ " geo:long '1.234'^^xsd:float ;", ".");
+
+ String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+ "WHERE {",
+ " ?s spatial:east (51.3000 0.0000 -1) .", "}");
+ Set<String> expectedURIs = (new HashSet<String>());
+ expectedURIs.addAll(Arrays.asList((new String[] {
+ "http://example.org/data/resource/" + label + "1",
+ "http://example.org/data/resource/" + label + "2" })));
+ doTestSearch(turtle, queryString, expectedURIs);
+ }
+
+ @Test
+ public void testArgumentListSize() {
+ final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
+ + RESOURCE_BASE + "testArgumentListSize>",
+ " geo:lat '51.3827'^^xsd:float ;",
+ " geo:long '-2.71909'^^xsd:float ", ".");
+ String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+ "WHERE {",
+ " ?s spatial:east (51.3000) .", "}");
+ doTestSearchThrowException(turtle, queryString);
+
+ queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+ "WHERE {",
+ " ?s spatial:east (51.3000 0.0000 -1 'another argument') .", "}");
+ doTestSearchThrowException(turtle, queryString);
+ }
+
+ @Test
+ public void testSearchLimitsResults() {
+ String label = "testSearchLimitsResults";
+ final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
+ + RESOURCE_BASE + label + "1>",
+ " geo:lat '51.885'^^xsd:float ;",
+ " geo:long '0.234'^^xsd:float ", ".",
+ "<" + RESOURCE_BASE + label + "2>",
+ " geo:lat '51.1234'^^xsd:float ;",
+ " geo:long '1.234'^^xsd:float ;", ".");
+ String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+ "WHERE {",
+ " ?s spatial:north (51.3000 0.0000 1) .", "}");
+ Set<String> expectedURIs = (new HashSet<String>());
+ expectedURIs.addAll( Arrays.asList((
+ new String[]
+ {
+ "http://example.org/data/resource/" + label + "1",
+ "http://example.org/data/resource/" + label + "2"
+ }
+ )));
+ doTestSearch(turtle, queryString, expectedURIs, 1);
+
+
+ queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+ "WHERE {",
+ " ?s spatial:east (51.3000 0.0000 -1) .", "}");
+ expectedURIs = (new HashSet<String>());
+ expectedURIs.addAll( Arrays.asList((
+ new String[]
+ {
+ "http://example.org/data/resource/" + label + "1",
+ "http://example.org/data/resource/" + label + "2"
+ }
+ )));
+ doTestSearch(turtle, queryString, expectedURIs);
+
+ queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+ "WHERE {",
+ " ?s spatial:east (51.3000 0.0000 3) .", "}");
+ expectedURIs = (new HashSet<String>());
+ expectedURIs.addAll( Arrays.asList((
+ new String[]
+ {
+ "http://example.org/data/resource/" + label + "1",
+ "http://example.org/data/resource/" + label + "2"
+ }
+ )));
+ doTestSearch(turtle, queryString, expectedURIs);
+
+ queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+ "WHERE {",
+ " ?s spatial:east (51.3000 0.0000 'something not an integer') .", "}");
+ expectedURIs = (new HashSet<String>());
+ doTestSearch(turtle, queryString, expectedURIs);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/jena/blob/d6ae87fd/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestIntersectsBoxPF.java
----------------------------------------------------------------------
diff --git a/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestIntersectsBoxPF.java b/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestIntersectsBoxPF.java
index f8f074b..0b30782 100644
--- a/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestIntersectsBoxPF.java
+++ b/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestIntersectsBoxPF.java
@@ -1,142 +1,142 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jena.query.spatial.pfunction;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.jena.atlas.lib.StrUtils;
-import org.apache.jena.query.spatial.AbstractTestDatasetWithSpatialIndex;
-import org.junit.Test;
-
-public abstract class AbstractTestIntersectsBoxPF extends AbstractTestDatasetWithSpatialIndex {
-
- @Test
- public void testOneSimpleResult() {
- final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
- + RESOURCE_BASE + "testOneSimpleResult>",
- " geo:lat '51.3827'^^xsd:float ;",
- " geo:long '-2.71909'^^xsd:float ", ".");
- String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
- "WHERE {",
- " ?s spatial:intersectBox (51.1000 -4.0000 51.4000 0.0000 -1) .", "}");
- Set<String> expectedURIs = (new HashSet<String>());
- expectedURIs
- .addAll(Arrays
- .asList((new String[] { "http://example.org/data/resource/testOneSimpleResult" })));
- doTestSearch(turtle, queryString, expectedURIs);
- }
-
- @Test
- public void testMultipleResults() {
- String label = "testMultipleResults";
- final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
- + RESOURCE_BASE + label + "1>",
- " geo:lat '51.3827'^^xsd:float ;",
- " geo:long '-2.71909'^^xsd:float ;" , ".",
- "<" + RESOURCE_BASE + label + "2>",
- " geo:lat '51.3967'^^xsd:float ;",
- " geo:long '-3.34333'^^xsd:float ;", ".");
-
- String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
- "WHERE {",
- " ?s spatial:intersectBox (51.1000 -4.0000 51.4000 0.0000) .", "}");
- Set<String> expectedURIs = (new HashSet<String>());
- expectedURIs.addAll(Arrays.asList((new String[] {
- "http://example.org/data/resource/" + label + "1",
- "http://example.org/data/resource/" + label + "2" })));
- doTestSearch(turtle, queryString, expectedURIs);
- }
-
- @Test
- public void testArgumentListSize() {
- final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
- + RESOURCE_BASE + "testArgumentListSize>",
- " geo:lat '51.3827'^^xsd:float ;",
- " geo:long '-2.71909'^^xsd:float ", ".");
- String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
- "WHERE {",
- " ?s spatial:intersectBox (51.1000 -4.0000 -1) .", "}");
- doTestSearchThrowException(turtle, queryString);
-
- queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
- "WHERE {",
- " ?s spatial:intersectBox (51.1000 -4.0000 51.4000 0.0000 -1 'some other argument') .", "}");
- doTestSearchThrowException(turtle, queryString);
- }
-
- @Test
- public void testSearchLimitsResults() {
- String label = "testSearchLimitsResults";
- final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
- + RESOURCE_BASE + label + "1>",
- " geo:lat '51.3827'^^xsd:float ;",
- " geo:long '-2.71909'^^xsd:float ;" , ".",
- "<" + RESOURCE_BASE + label + "2>",
- " geo:lat '51.3967'^^xsd:float ;",
- " geo:long '-3.34333'^^xsd:float ;", ".");
- String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
- "WHERE {",
- " ?s spatial:intersectBox (51.1000 -4.0000 51.4000 0.0000 1) .", "}");
- Set<String> expectedURIs = (new HashSet<String>());
- expectedURIs.addAll( Arrays.asList((
- new String[]
- {
- "http://example.org/data/resource/" + label + "1",
- "http://example.org/data/resource/" + label + "2"
- }
- )));
- doTestSearch(turtle, queryString, expectedURIs, 1);
-
-
- queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
- "WHERE {",
- " ?s spatial:intersectBox (51.1000 -4.0000 51.4000 0.0000 -1) .", "}");
- expectedURIs = (new HashSet<String>());
- expectedURIs.addAll( Arrays.asList((
- new String[]
- {
- "http://example.org/data/resource/" + label + "1",
- "http://example.org/data/resource/" + label + "2"
- }
- )));
- doTestSearch(turtle, queryString, expectedURIs);
-
- queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
- "WHERE {",
- " ?s spatial:intersectBox (51.1000 -4.0000 51.4000 0.0000 3) .", "}");
- expectedURIs = (new HashSet<String>());
- expectedURIs.addAll( Arrays.asList((
- new String[]
- {
- "http://example.org/data/resource/" + label + "1",
- "http://example.org/data/resource/" + label + "2"
- }
- )));
- doTestSearch(turtle, queryString, expectedURIs);
-
- queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
- "WHERE {",
- " ?s spatial:withinBox (51.1000 -4.0000 51.4000 0.0000 'something not an integer') .", "}");
- expectedURIs = (new HashSet<String>());
- doTestSearch(turtle, queryString, expectedURIs);
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.query.spatial.pfunction;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.jena.atlas.lib.StrUtils;
+import org.apache.jena.query.spatial.AbstractTestDatasetWithSpatialIndex;
+import org.junit.Test;
+
+public abstract class AbstractTestIntersectsBoxPF extends AbstractTestDatasetWithSpatialIndex {
+
+ @Test
+ public void testOneSimpleResult() {
+ final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
+ + RESOURCE_BASE + "testOneSimpleResult>",
+ " geo:lat '51.3827'^^xsd:float ;",
+ " geo:long '-2.71909'^^xsd:float ", ".");
+ String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+ "WHERE {",
+ " ?s spatial:intersectBox (51.1000 -4.0000 51.4000 0.0000 -1) .", "}");
+ Set<String> expectedURIs = (new HashSet<String>());
+ expectedURIs
+ .addAll(Arrays
+ .asList((new String[] { "http://example.org/data/resource/testOneSimpleResult" })));
+ doTestSearch(turtle, queryString, expectedURIs);
+ }
+
+ @Test
+ public void testMultipleResults() {
+ String label = "testMultipleResults";
+ final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
+ + RESOURCE_BASE + label + "1>",
+ " geo:lat '51.3827'^^xsd:float ;",
+ " geo:long '-2.71909'^^xsd:float ;" , ".",
+ "<" + RESOURCE_BASE + label + "2>",
+ " geo:lat '51.3967'^^xsd:float ;",
+ " geo:long '-3.34333'^^xsd:float ;", ".");
+
+ String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+ "WHERE {",
+ " ?s spatial:intersectBox (51.1000 -4.0000 51.4000 0.0000) .", "}");
+ Set<String> expectedURIs = (new HashSet<String>());
+ expectedURIs.addAll(Arrays.asList((new String[] {
+ "http://example.org/data/resource/" + label + "1",
+ "http://example.org/data/resource/" + label + "2" })));
+ doTestSearch(turtle, queryString, expectedURIs);
+ }
+
+ @Test
+ public void testArgumentListSize() {
+ final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
+ + RESOURCE_BASE + "testArgumentListSize>",
+ " geo:lat '51.3827'^^xsd:float ;",
+ " geo:long '-2.71909'^^xsd:float ", ".");
+ String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+ "WHERE {",
+ " ?s spatial:intersectBox (51.1000 -4.0000 -1) .", "}");
+ doTestSearchThrowException(turtle, queryString);
+
+ queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+ "WHERE {",
+ " ?s spatial:intersectBox (51.1000 -4.0000 51.4000 0.0000 -1 'some other argument') .", "}");
+ doTestSearchThrowException(turtle, queryString);
+ }
+
+ @Test
+ public void testSearchLimitsResults() {
+ String label = "testSearchLimitsResults";
+ final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
+ + RESOURCE_BASE + label + "1>",
+ " geo:lat '51.3827'^^xsd:float ;",
+ " geo:long '-2.71909'^^xsd:float ;" , ".",
+ "<" + RESOURCE_BASE + label + "2>",
+ " geo:lat '51.3967'^^xsd:float ;",
+ " geo:long '-3.34333'^^xsd:float ;", ".");
+ String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+ "WHERE {",
+ " ?s spatial:intersectBox (51.1000 -4.0000 51.4000 0.0000 1) .", "}");
+ Set<String> expectedURIs = (new HashSet<String>());
+ expectedURIs.addAll( Arrays.asList((
+ new String[]
+ {
+ "http://example.org/data/resource/" + label + "1",
+ "http://example.org/data/resource/" + label + "2"
+ }
+ )));
+ doTestSearch(turtle, queryString, expectedURIs, 1);
+
+
+ queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+ "WHERE {",
+ " ?s spatial:intersectBox (51.1000 -4.0000 51.4000 0.0000 -1) .", "}");
+ expectedURIs = (new HashSet<String>());
+ expectedURIs.addAll( Arrays.asList((
+ new String[]
+ {
+ "http://example.org/data/resource/" + label + "1",
+ "http://example.org/data/resource/" + label + "2"
+ }
+ )));
+ doTestSearch(turtle, queryString, expectedURIs);
+
+ queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+ "WHERE {",
+ " ?s spatial:intersectBox (51.1000 -4.0000 51.4000 0.0000 3) .", "}");
+ expectedURIs = (new HashSet<String>());
+ expectedURIs.addAll( Arrays.asList((
+ new String[]
+ {
+ "http://example.org/data/resource/" + label + "1",
+ "http://example.org/data/resource/" + label + "2"
+ }
+ )));
+ doTestSearch(turtle, queryString, expectedURIs);
+
+ queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+ "WHERE {",
+ " ?s spatial:withinBox (51.1000 -4.0000 51.4000 0.0000 'something not an integer') .", "}");
+ expectedURIs = (new HashSet<String>());
+ doTestSearch(turtle, queryString, expectedURIs);
+ }
+
+}