Revision 31085
| branches/v2_0_0_prep/extensions/extGeocoding/src/org/gvsig/geocoding/gui/GeocodingPanel.java | ||
|---|---|---|
| 56 | 56 |
import org.gvsig.geocoding.extension.GeocodingController; |
| 57 | 57 |
import org.gvsig.geocoding.gui.address.AbstractAddressPanel; |
| 58 | 58 |
import org.gvsig.geocoding.gui.settings.SettingsPanel; |
| 59 |
import org.gvsig.geocoding.pattern.Patterngeocoding;
|
|
| 60 |
import org.gvsig.geocoding.pattern.impl.DefaultPatterngeocoding;
|
|
| 59 |
import org.gvsig.geocoding.pattern.GeocodingPattern;
|
|
| 60 |
import org.gvsig.geocoding.pattern.impl.DefaultGeocodingPattern;
|
|
| 61 | 61 |
import org.gvsig.geocoding.result.GeocodingResult; |
| 62 | 62 |
import org.gvsig.geocoding.utils.GeocodingUtils; |
| 63 | 63 |
import org.gvsig.tools.ToolsLocator; |
| ... | ... | |
| 632 | 632 |
*/ |
| 633 | 633 |
private void evEditPattern(java.awt.event.ActionEvent evt) {
|
| 634 | 634 |
|
| 635 |
Patterngeocoding pat = control.getPattern(); |
|
| 636 |
Patterngeocoding copypat = null; |
|
| 637 |
// Copiar del patr?n (Clonar) |
|
| 638 |
PersistenceManager manager = ToolsLocator.getPersistenceManager(); |
|
| 639 |
PersistentState state = null; |
|
| 635 |
GeocodingPattern pat = control.getPattern(); |
|
| 636 |
GeocodingPattern copypat = null; |
|
| 637 |
// Copiar del patr?n (Clonar) |
|
| 640 | 638 |
try {
|
| 641 | 639 |
XMLEntity xml = pat.getXMLEntity(); |
| 642 |
copypat = new DefaultPatterngeocoding();
|
|
| 640 |
copypat = new DefaultGeocodingPattern();
|
|
| 643 | 641 |
copypat.setXMLEntity(xml); |
| 644 | 642 |
} catch (Exception e) {
|
| 645 | 643 |
log.error("Error cloning the pattern", e);
|
| branches/v2_0_0_prep/extensions/extGeocoding/src/org/gvsig/geocoding/gui/GeocodingModel.java | ||
|---|---|---|
| 35 | 35 |
import org.gvsig.fmap.dal.DataStore; |
| 36 | 36 |
import org.gvsig.fmap.dal.feature.FeatureStore; |
| 37 | 37 |
import org.gvsig.fmap.mapcontext.layers.vectorial.FLyrVect; |
| 38 |
import org.gvsig.geocoding.pattern.Patterngeocoding;
|
|
| 38 |
import org.gvsig.geocoding.pattern.GeocodingPattern;
|
|
| 39 | 39 |
import org.gvsig.geocoding.result.GeocodingResult; |
| 40 | 40 |
|
| 41 | 41 |
/** |
| ... | ... | |
| 47 | 47 |
|
| 48 | 48 |
public class GeocodingModel implements IGeocodingModel {
|
| 49 | 49 |
|
| 50 |
private Patterngeocoding pattern = null;
|
|
| 50 |
private GeocodingPattern pattern = null;
|
|
| 51 | 51 |
|
| 52 | 52 |
private File patternFile = null; |
| 53 | 53 |
|
| ... | ... | |
| 81 | 81 |
* |
| 82 | 82 |
* @return |
| 83 | 83 |
*/ |
| 84 |
public Patterngeocoding getPattern() {
|
|
| 84 |
public GeocodingPattern getPattern() {
|
|
| 85 | 85 |
return pattern; |
| 86 | 86 |
} |
| 87 | 87 |
|
| ... | ... | |
| 90 | 90 |
* |
| 91 | 91 |
* @param pat |
| 92 | 92 |
*/ |
| 93 |
public void setPattern(Patterngeocoding pat) {
|
|
| 93 |
public void setPattern(GeocodingPattern pat) {
|
|
| 94 | 94 |
pattern = pat; |
| 95 | 95 |
} |
| 96 | 96 |
|
| branches/v2_0_0_prep/extensions/extGeocoding/src/org/gvsig/geocoding/gui/newpattern/NewPatternPanel.java | ||
|---|---|---|
| 67 | 67 |
import org.gvsig.geocoding.gui.styles.SimpleCentroidStyle; |
| 68 | 68 |
import org.gvsig.geocoding.gui.styles.SimpleRangeStyle; |
| 69 | 69 |
import org.gvsig.geocoding.pattern.GeocodingSettings; |
| 70 |
import org.gvsig.geocoding.pattern.Patterngeocoding;
|
|
| 71 |
import org.gvsig.geocoding.pattern.impl.DefaultPatterngeocoding;
|
|
| 70 |
import org.gvsig.geocoding.pattern.GeocodingPattern;
|
|
| 71 |
import org.gvsig.geocoding.pattern.impl.DefaultGeocodingPattern;
|
|
| 72 | 72 |
import org.gvsig.geocoding.styles.AbstractGeocodingStyle; |
| 73 | 73 |
import org.gvsig.geocoding.styles.impl.Composed; |
| 74 | 74 |
import org.gvsig.geocoding.styles.impl.DoubleRange; |
| ... | ... | |
| 92 | 92 |
.getLogger(NewPatternPanel.class); |
| 93 | 93 |
private static final long serialVersionUID = 1L; |
| 94 | 94 |
|
| 95 |
private Patterngeocoding pattern = null;
|
|
| 95 |
private GeocodingPattern pattern = null;
|
|
| 96 | 96 |
private GeocodingController control = null; |
| 97 | 97 |
|
| 98 | 98 |
private SimpleRangePanel srange = null; |
| ... | ... | |
| 127 | 127 |
/** |
| 128 | 128 |
* Constructor |
| 129 | 129 |
*/ |
| 130 |
public NewPatternPanel(GeocodingController _control, Patterngeocoding pat) {
|
|
| 130 |
public NewPatternPanel(GeocodingController _control, GeocodingPattern pat) {
|
|
| 131 | 131 |
this.control = _control; |
| 132 | 132 |
|
| 133 | 133 |
initComponents(); |
| ... | ... | |
| 152 | 152 |
editing = true; |
| 153 | 153 |
updatePanel(pat); |
| 154 | 154 |
} else {
|
| 155 |
pattern = new DefaultPatterngeocoding();
|
|
| 155 |
pattern = new DefaultGeocodingPattern();
|
|
| 156 | 156 |
control.getGmodel().setPattern(pattern); |
| 157 | 157 |
|
| 158 | 158 |
// put settings parameters |
| ... | ... | |
| 167 | 167 |
* |
| 168 | 168 |
* @param pat |
| 169 | 169 |
*/ |
| 170 |
public void updatePanel(Patterngeocoding pat) {
|
|
| 170 |
public void updatePanel(GeocodingPattern pat) {
|
|
| 171 | 171 |
|
| 172 | 172 |
// update settings |
| 173 | 173 |
settingsPanel.setMaxResults(pat.getSettings().getResultsNumber()); |
| branches/v2_0_0_prep/extensions/extGeocoding/src/org/gvsig/geocoding/gui/IGeocodingModel.java | ||
|---|---|---|
| 31 | 31 |
import java.util.List; |
| 32 | 32 |
import java.util.Set; |
| 33 | 33 |
|
| 34 |
import org.gvsig.fmap.dal.DataStore; |
|
| 34 |
|
|
| 35 | 35 |
import org.gvsig.fmap.dal.feature.FeatureStore; |
| 36 | 36 |
import org.gvsig.fmap.mapcontext.layers.vectorial.FLyrVect; |
| 37 |
import org.gvsig.geocoding.pattern.Patterngeocoding;
|
|
| 37 |
import org.gvsig.geocoding.pattern.GeocodingPattern;
|
|
| 38 | 38 |
import org.gvsig.geocoding.result.GeocodingResult; |
| 39 | 39 |
|
| 40 | 40 |
/** |
| ... | ... | |
| 57 | 57 |
* |
| 58 | 58 |
* @return |
| 59 | 59 |
*/ |
| 60 |
public Patterngeocoding getPattern();
|
|
| 60 |
public GeocodingPattern getPattern();
|
|
| 61 | 61 |
|
| 62 | 62 |
/** |
| 63 | 63 |
* This method sets the Geocoding Pattern |
| 64 | 64 |
* |
| 65 | 65 |
* @param pat |
| 66 | 66 |
*/ |
| 67 |
public void setPattern(Patterngeocoding pat);
|
|
| 67 |
public void setPattern(GeocodingPattern pat);
|
|
| 68 | 68 |
|
| 69 | 69 |
/** |
| 70 | 70 |
* This method gets the layer source |
| branches/v2_0_0_prep/extensions/extGeocoding/src/org/gvsig/geocoding/extension/GeocodingTask.java | ||
|---|---|---|
| 40 | 40 |
import org.gvsig.geocoding.address.Address; |
| 41 | 41 |
import org.gvsig.geocoding.gui.TableResultsModel; |
| 42 | 42 |
import org.gvsig.geocoding.impl.DataGeocoderImpl; |
| 43 |
import org.gvsig.geocoding.pattern.Patterngeocoding;
|
|
| 43 |
import org.gvsig.geocoding.pattern.GeocodingPattern;
|
|
| 44 | 44 |
import org.gvsig.geocoding.result.GeocodingResult; |
| 45 | 45 |
import org.gvsig.utils.swing.threads.AbstractMonitorableTask; |
| 46 | 46 |
import org.slf4j.Logger; |
| ... | ... | |
| 190 | 190 |
* @param address |
| 191 | 191 |
* @return set with sorted results |
| 192 | 192 |
*/ |
| 193 |
private Set<GeocodingResult> geocoding(Patterngeocoding pat, Address address) {
|
|
| 193 |
private Set<GeocodingResult> geocoding(GeocodingPattern pat, Address address) {
|
|
| 194 | 194 |
|
| 195 | 195 |
Set<GeocodingResult> results = new TreeSet<GeocodingResult>(); |
| 196 | 196 |
try {
|
| branches/v2_0_0_prep/extensions/extGeocoding/src/org/gvsig/geocoding/extension/GeocodingController.java | ||
|---|---|---|
| 68 | 68 |
import org.gvsig.geocoding.gui.relation.RelatePanel; |
| 69 | 69 |
import org.gvsig.geocoding.gui.results.ResultsPanel; |
| 70 | 70 |
import org.gvsig.geocoding.pattern.GeocodingSettings; |
| 71 |
import org.gvsig.geocoding.pattern.Patterngeocoding;
|
|
| 71 |
import org.gvsig.geocoding.pattern.GeocodingPattern;
|
|
| 72 | 72 |
import org.gvsig.geocoding.result.GeocodingResult; |
| 73 | 73 |
import org.gvsig.geocoding.styles.AbstractGeocodingStyle; |
| 74 | 74 |
import org.gvsig.geocoding.styles.impl.AbstractRange; |
| ... | ... | |
| 268 | 268 |
log.debug("file created: " + file);
|
| 269 | 269 |
if (file != null) {
|
| 270 | 270 |
file = GeocodingUtils.addXMLSuffix(file); |
| 271 |
Patterngeocoding pat = this.getGmodel().getPattern();
|
|
| 271 |
GeocodingPattern pat = this.getGmodel().getPattern();
|
|
| 272 | 272 |
pat.setPatternName(file.getName()); |
| 273 | 273 |
try {
|
| 274 | 274 |
pat.saveToXML(file); |
| ... | ... | |
| 293 | 293 |
* |
| 294 | 294 |
* @param pat |
| 295 | 295 |
*/ |
| 296 |
public void launchNewPatternPanel(Patterngeocoding pat) {
|
|
| 296 |
public void launchNewPatternPanel(GeocodingPattern pat) {
|
|
| 297 | 297 |
|
| 298 | 298 |
List<FLyrVect> lyrs = this.getListgvSIGVectLayers(); |
| 299 | 299 |
if (lyrs.size() > 0) {
|
| ... | ... | |
| 330 | 330 |
* |
| 331 | 331 |
* @return pattern |
| 332 | 332 |
*/ |
| 333 |
public Patterngeocoding getPattern() {
|
|
| 333 |
public GeocodingPattern getPattern() {
|
|
| 334 | 334 |
return this.getGmodel().getPattern(); |
| 335 | 335 |
} |
| 336 | 336 |
|
| ... | ... | |
| 396 | 396 |
* @return panel |
| 397 | 397 |
*/ |
| 398 | 398 |
public AbstractAddressPanel getAddressPanelFromPatternStyle() {
|
| 399 |
Patterngeocoding pat = this.getPattern();
|
|
| 399 |
GeocodingPattern pat = this.getPattern();
|
|
| 400 | 400 |
if (pat != null) {
|
| 401 | 401 |
AbstractGeocodingStyle style = pat.getSource().getStyle(); |
| 402 | 402 |
Literal lit = style.getRelationsLiteral(); |
| branches/v2_0_0_prep/extensions/extGeocoding/src/org/gvsig/geocoding/utils/PatternLoaderThread.java | ||
|---|---|---|
| 38 | 38 |
import org.gvsig.fmap.mapcontext.layers.FLayer; |
| 39 | 39 |
import org.gvsig.fmap.mapcontext.layers.FLayers; |
| 40 | 40 |
import org.gvsig.fmap.mapcontext.layers.vectorial.FLyrVect; |
| 41 |
import org.gvsig.geocoding.pattern.Patterngeocoding;
|
|
| 42 |
import org.gvsig.geocoding.pattern.impl.DefaultPatterngeocoding;
|
|
| 41 |
import org.gvsig.geocoding.pattern.GeocodingPattern;
|
|
| 42 |
import org.gvsig.geocoding.pattern.impl.DefaultGeocodingPattern;
|
|
| 43 | 43 |
import org.slf4j.Logger; |
| 44 | 44 |
import org.slf4j.LoggerFactory; |
| 45 | 45 |
|
| ... | ... | |
| 57 | 57 |
.getLogger(PatternLoaderThread.class); |
| 58 | 58 |
private File file = null; |
| 59 | 59 |
private boolean ok = true; |
| 60 |
private Patterngeocoding pattern = null;
|
|
| 60 |
private GeocodingPattern pattern = null;
|
|
| 61 | 61 |
|
| 62 | 62 |
/** |
| 63 | 63 |
* Constructor |
| ... | ... | |
| 80 | 80 |
* run |
| 81 | 81 |
*/ |
| 82 | 82 |
public void run() {
|
| 83 |
pattern = new DefaultPatterngeocoding();
|
|
| 83 |
pattern = new DefaultGeocodingPattern();
|
|
| 84 | 84 |
if (this.file != null) {
|
| 85 | 85 |
try {
|
| 86 | 86 |
pattern.loadFromXML(this.file); |
| ... | ... | |
| 131 | 131 |
/** |
| 132 | 132 |
* @return the pattern |
| 133 | 133 |
*/ |
| 134 |
public Patterngeocoding getPattern() {
|
|
| 134 |
public GeocodingPattern getPattern() {
|
|
| 135 | 135 |
return pattern; |
| 136 | 136 |
} |
| 137 | 137 |
|
| ... | ... | |
| 143 | 143 |
* @return |
| 144 | 144 |
* @throws GeocodingNoDataStoreException |
| 145 | 145 |
*/ |
| 146 |
private DataStore searchLayer(Patterngeocoding pat)
|
|
| 146 |
private DataStore searchLayer(GeocodingPattern pat)
|
|
| 147 | 147 |
throws GeocodingNoDataStoreException {
|
| 148 | 148 |
String name = pat.getSource().getLayerName(); |
| 149 | 149 |
String provi = pat.getSource().getLayerProvider(); |
Also available in: Unified diff