Revision 43510 trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.labeling.app/org.gvsig.labeling.app.mainplugin/src/main/java/org/gvsig/labeling/placements/MarkerPlacementOnPoint.java

View differences:

MarkerPlacementOnPoint.java
1
/* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
1
/**
2
 * gvSIG. Desktop Geographic Information System.
2 3
 *
3
 * Copyright (C) 2005 IVER T.I. and Generalitat Valenciana.
4
 * Copyright (C) 2007-2013 gvSIG Association.
4 5
 *
5 6
 * This program is free software; you can redistribute it and/or
6 7
 * modify it under the terms of the GNU General Public License
7
 * as published by the Free Software Foundation; either version 2
8
 * as published by the Free Software Foundation; either version 3
8 9
 * of the License, or (at your option) any later version.
9 10
 *
10 11
 * This program is distributed in the hope that it will be useful,
......
14 15
 *
15 16
 * You should have received a copy of the GNU General Public License
16 17
 * along with this program; if not, write to the Free Software
17
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
18
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
19
 * MA  02110-1301, USA.
18 20
 *
19
 * For more information, contact:
20
 *
21
 *  Generalitat Valenciana
22
 *   Conselleria d'Infraestructures i Transport
23
 *   Av. Blasco Ib??ez, 50
24
 *   46010 VALENCIA
25
 *   SPAIN
26
 *
27
 *      +34 963862235
28
 *   gvsig@gva.es
29
 *      www.gvsig.gva.es
30
 *
31
 *    or
32
 *
33
 *   IVER T.I. S.A
34
 *   Salamanca 50
35
 *   46005 Valencia
36
 *   Spain
37
 *
38
 *   +34 963163400
39
 *   dac@iver.es
21
 * For any additional information, do not hesitate to contact us
22
 * at info AT gvsig.com, or visit our website www.gvsig.com.
40 23
 */
41 24
package org.gvsig.labeling.placements;
42 25

  
......
46 29

  
47 30
import org.gvsig.fmap.geom.Geometry;
48 31
import org.gvsig.fmap.geom.Geometry.TYPES;
32
import org.gvsig.fmap.geom.GeometryLocator;
33
import org.gvsig.fmap.geom.GeometryManager;
49 34
import org.gvsig.fmap.geom.primitive.Point;
50 35
import org.gvsig.fmap.mapcontext.ViewPort;
51 36
import org.gvsig.fmap.mapcontext.rendering.legend.styling.ILabelClass;
......
66 51
			IPlacementConstraints placementConstraints,
67 52
			double cartographicSymbolSize, Cancellable cancel) {
68 53

  
69
		if (cancel.isCanceled()) return CannotPlaceLabel.NO_PLACES;
54
		if (cancel.isCanceled()) {
55
            return CannotPlaceLabel.NO_PLACES;
56
        }
70 57

  
71 58
		ArrayList<LabelLocationMetrics> guessed = new ArrayList<LabelLocationMetrics>();
72 59
		
......
89 76
	}
90 77

  
91 78

  
79
    @Override
92 80
	public ArrayList<LabelLocationMetrics> guess(
93 81
			ILabelClass lc,
94 82
			Geometry geom,
......
121 109
		return guessed;
122 110
	}
123 111

  
112
    @Override
124 113
	public boolean isSuitableFor(
125 114
			IPlacementConstraints placementConstraints,
126 115
			int shapeType) {
127
		
128
		
129
		if (shapeType == TYPES.POINT) {
130
			return placementConstraints.isOnTopOfThePoint();
116
        GeometryManager geomManager = GeometryLocator.getGeometryManager();
117
        if( geomManager.isSubtype(TYPES.POINT, shapeType) ) {
118
			return placementConstraints != null && placementConstraints.isOnTopOfThePoint();
131 119
		} else{
132 120
			return false;
133 121
		}

Also available in: Unified diff