diff --git a/src/org/oscim/tilesource/MapOptions.java b/src/org/oscim/tilesource/MapOptions.java deleted file mode 100644 index c43e2dc7..00000000 --- a/src/org/oscim/tilesource/MapOptions.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2012 Hannes Janetzek - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program. If not, see . - */ -package org.oscim.tilesource; - -import java.util.HashMap; - -public class MapOptions extends HashMap { - - private static final long serialVersionUID = 1L; - - public final TileSources db; - - public MapOptions(TileSources db) { - this.db = db; - } - - @Override - public boolean equals(Object other) { - if (!(other instanceof MapOptions)) - return false; - - if (this.db != ((MapOptions) other).db) - return false; - - // FIXME test if this is correct! - if (!this.entrySet().equals(((MapOptions) other).entrySet())) - return false; - - return true; - } -} diff --git a/src/org/oscim/tilesource/TileSource.java b/src/org/oscim/tilesource/TileSource.java index 9b802f59..4ace484a 100644 --- a/src/org/oscim/tilesource/TileSource.java +++ b/src/org/oscim/tilesource/TileSource.java @@ -46,14 +46,14 @@ public abstract class TileSource { @Override public boolean equals(Object other) { - if (!(other instanceof MapOptions)) + if (!(other instanceof Options)) return false; //if (this.db != ((MapOptions) other).db) // return false; // FIXME test if this is correct! - if (!this.entrySet().equals(((MapOptions) other).entrySet())) + if (!this.entrySet().equals(((Options) other).entrySet())) return false; return true;