[DebianGIS-dev] r2823 - in packages/jts/trunk/debian: . patches
frankie at alioth.debian.org
frankie at alioth.debian.org
Mon Apr 12 19:49:47 UTC 2010
Author: frankie
Date: 2010-04-12 19:49:46 +0000 (Mon, 12 Apr 2010)
New Revision: 2823
Removed:
packages/jts/trunk/debian/patches/0_IndexedPointInAreaLocator.diff
Modified:
packages/jts/trunk/debian/changelog
Log:
Removed obsolete patch
Modified: packages/jts/trunk/debian/changelog
===================================================================
--- packages/jts/trunk/debian/changelog 2010-04-12 19:48:39 UTC (rev 2822)
+++ packages/jts/trunk/debian/changelog 2010-04-12 19:49:46 UTC (rev 2823)
@@ -2,6 +2,7 @@
* New upstream release.
* Policy bumped to 3.8.4, without changes.
+ * Removed now superfluous patch, merged upstream.
-- Francesco Paolo Lovergine <frankie at debian.org> Mon, 12 Apr 2010 21:43:26 +0200
Deleted: packages/jts/trunk/debian/patches/0_IndexedPointInAreaLocator.diff
===================================================================
--- packages/jts/trunk/debian/patches/0_IndexedPointInAreaLocator.diff 2010-04-12 19:48:39 UTC (rev 2822)
+++ packages/jts/trunk/debian/patches/0_IndexedPointInAreaLocator.diff 2010-04-12 19:49:46 UTC (rev 2823)
@@ -1,176 +0,0 @@
-diff -Nur -x '*.orig' -x '*~' jts-1.10/src/com/vividsolutions/jts/algorithm/IndexedPointInAreaLocator.java jts-1.10.new/src/com/vividsolutions/jts/algorithm/IndexedPointInAreaLocator.java
---- jts-1.10/src/com/vividsolutions/jts/algorithm/IndexedPointInAreaLocator.java 2007-07-24 15:52:54.000000000 +0200
-+++ jts-1.10.new/src/com/vividsolutions/jts/algorithm/IndexedPointInAreaLocator.java 1970-01-01 01:00:00.000000000 +0100
-@@ -1,172 +0,0 @@
--/*
-- * The JTS Topology Suite is a collection of Java classes that
-- * implement the fundamental operations required to validate a given
-- * geo-spatial data set to a known topological specification.
-- *
-- * Copyright (C) 2001 Vivid Solutions
-- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-- * License as published by the Free Software Foundation; either
-- * version 2.1 of the License, or (at your option) any later version.
-- *
-- * This library is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- * Lesser General Public License for more details.
-- *
-- * You should have received a copy of the GNU Lesser General Public
-- * License along with this library; if not, write to the Free Software
-- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-- *
-- * For more information, contact:
-- *
-- * Vivid Solutions
-- * Suite #1A
-- * 2328 Government Street
-- * Victoria BC V8T 5G5
-- * Canada
-- *
-- * (250)385-6040
-- * www.vividsolutions.com
-- */
--package com.vividsolutions.jts.algorithm;
--
--import java.util.*;
--
--import com.vividsolutions.jts.geom.*;
--import com.vividsolutions.jts.geom.util.*;
--import com.vividsolutions.jts.index.*;
--import com.vividsolutions.jts.index.intervalrtree.*;
--
--/**
-- * Determines the location of {@link Coordinate}s relative to
-- * a {@link Polygonal} geometry, using indexing for efficiency.
-- * This algorithm is suitable for use in cases where
-- * many points will be tested against a given area.
-- *
-- * @author Martin Davis
-- *
-- */
--public class IndexedPointInAreaLocator
-- implements PointInAreaLocator
--{
-- private Geometry areaGeom;
-- private IntervalIndexedGeometry index;
--
-- /**
-- * Creates a new locator for a given {@link Geometry}
-- * @param g the Geometry to locate in
-- */
-- public IndexedPointInAreaLocator(Geometry g)
-- {
-- areaGeom = g;
-- if (! (g instanceof Polygonal))
-- throw new IllegalArgumentException("Argument must be Polygonal");
-- buildIndex(g);
-- }
--
-- private void buildIndex(Geometry g)
-- {
-- index = new IntervalIndexedGeometry(g);
-- }
--
-- /**
-- * Determines the {@link Location} of a point in an areal {@link Geometry}.
-- *
-- * @param p the point to test
-- * @return the location of the point in the geometry
-- */
-- public int locate(Coordinate p)
-- {
-- RayCrossingCounter rcc = new RayCrossingCounter(p);
--
--
-- SegmentVisitor visitor = new SegmentVisitor(rcc);
-- index.query(p.y, p.y, visitor);
--
-- /*
-- // MD - slightly slower alternative
-- List segs = index.query(p.y, p.y);
-- countSegs(rcc, segs);
-- */
--
-- return rcc.getLocation();
-- }
--
-- /*
-- private void countSegs(RayCrossingCounter rcc, List segs)
-- {
-- for (Iterator i = segs.iterator(); i.hasNext(); ) {
-- LineSegment seg = (LineSegment) i.next();
-- rcc.countSegment(seg.getCoordinate(0), seg.getCoordinate(1));
--
-- // short-circuit if possible
-- if (rcc.isOnSegment()) return;
-- }
-- }
-- */
--
-- private static class SegmentVisitor
-- implements ItemVisitor
-- {
-- private RayCrossingCounter counter;
--
-- public SegmentVisitor(RayCrossingCounter counter)
-- {
-- this.counter = counter;
-- }
--
-- public void visitItem(Object item)
-- {
-- LineSegment seg = (LineSegment) item;
-- counter.countSegment(seg.getCoordinate(0), seg.getCoordinate(1));
-- }
-- }
--
-- private static class IntervalIndexedGeometry
-- {
-- private SortedPackedIntervalRTree index= new SortedPackedIntervalRTree();
--
-- public IntervalIndexedGeometry(Geometry geom)
-- {
-- init(geom);
-- }
--
-- private void init(Geometry geom)
-- {
-- List lines = LinearComponentExtracter.getLines(geom);
-- for (Iterator i = lines.iterator(); i.hasNext(); ) {
-- LineString line = (LineString) i.next();
-- Coordinate[] pts = line.getCoordinates();
-- addLine(pts);
-- }
-- }
--
-- private void addLine(Coordinate[] pts)
-- {
-- for (int i = 1; i < pts.length; i++) {
-- LineSegment seg = new LineSegment(pts[i-1], pts[i]);
-- double min = Math.min(seg.p0.y, seg.p1.y);
-- double max = Math.max(seg.p0.y, seg.p1.y);
-- index.insert(min, max, seg);
-- }
-- }
--
-- public List query(double min, double max)
-- {
-- ArrayListVisitor visitor = new ArrayListVisitor();
-- index.query(min, max, visitor);
-- return visitor.getItems();
-- }
--
-- public void query(double min, double max, ItemVisitor visitor)
-- {
-- index.query(min, max, visitor);
-- }
-- }
--
--}
--
--
--
More information about the Pkg-grass-devel
mailing list