Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
@xfischer
xfischer committed Mar 11, 2020
2 parents 4bb27ee + 6e7e6ff commit d30f5af
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 41 deletions.
1 change: 1 addition & 0 deletions DEM.Net.Core/Configuration/AppSecrets.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ public class AppSecrets
public string MapBoxToken { get; set; }
public string MapTilerKey { get; set; }
public string SketchFabToken { get; set; }
public string ThunderForestApiKey { get; set; }
}

}
19 changes: 8 additions & 11 deletions DEM.Net.Core/Model/Datasets/DEMDataSet.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,11 @@ public class DEMDataSet
ResolutionArcSeconds = 3,
PointsPerDegree = 1200,
Attribution = new Attribution(ATTRIBUTION_SUBJECT, "SRTM_GL3 OpenTopography", "https://opentopography.org/"
, @"Citing LP DAVV and Data Products: https://lpdaac.usgs.gov/about/citing_lp_daac_and_data
If you wish to cite the SRTM products in a report or publication please use:
Farr, T. G., and M. Kobrick, 2000, Shuttle Radar Topography Mission produces a wealth of data. Eos Trans. AGU, 81:583-583.
Farr, T. G. et al., 2007, The Shuttle Radar Topography Mission, Rev. Geophys., 45, RG2004, doi:10.1029/2005RG000183. (Also available online at http://www2.jpl.nasa.gov/srtm/SRTM_paper.pdf)
Kobrick, M., 2006, On the toes of giants--How SRTM was born, Photogramm. Eng. Remote Sens., 72:206-210.
Rosen, P. A. et al., 2000, Synthetic aperture radar interferometry, Proc. IEEE, 88:333-382.
https://doi.org/10.5069/G9445JDF")
, "Farr, T. G., and M. Kobrick, 2000, Shuttle Radar Topography Mission produces a wealth of data. Eos Trans. AGU, 81:583-583." + Environment.NewLine +
"Farr, T. G. et al., 2007, The Shuttle Radar Topography Mission, Rev. Geophys., 45, RG2004, doi:10.1029/2005RG000183. (Also available online at http://www2.jpl.nasa.gov/srtm/SRTM_paper.pdf)" + Environment.NewLine +
"Kobrick, M., 2006, On the toes of giants--How SRTM was born, Photogramm. Eng. Remote Sens., 72:206-210." + Environment.NewLine +
"Rosen, P. A. et al., 2000, Synthetic aperture radar interferometry, Proc. IEEE, 88:333-382." + Environment.NewLine +
"https://doi.org/10.5069/G9445JDF")
});
datasets.Add("SRTM_GL1", new DEMDataSet()
{
Expand All @@ -105,10 +103,9 @@ public class DEMDataSet
PointsPerDegree = 3600,
NoDataValue = -9999,
Attribution = new Attribution(ATTRIBUTION_SUBJECT, "AW3D30 OpenTopography", "https://opentopography.org/"
, @"J. Takaku, T. Tadono, K. Tsutsui : Generation of High Resolution Global DSM from ALOS PRISM, The International Archives of the Photogrammetry, Remote Sensing and Spatial Information Sciences, pp.243-248, Vol. XL-4, ISPRS TC IV Symposium, Suzhou, China, 2014. [http://www.int-arch-photogramm-remote-sens-spatial-inf-sci.net/XL-4/243/2014/isprsarchives-XL-4-243-2014.pdf]
T.Tadono, H.Ishida, F.Oda, S.Naito, K.Minakawa, H.Iwamoto : Precise Global DEM Generation By ALOS PRISM, ISPRS Annals of the Photogrammetry, Remote Sensing and Spatial Information Sciences, pp.71 - 76, Vol.II - 4, 2014. [http://www.isprs-ann-photogramm-remote-sens-spatial-inf-sci.net/II-4/71/2014/isprsannals-II-4-71-2014.pdf]
https://doi.org/10.5069/G94M92HB
")
, "J. Takaku, T. Tadono, K. Tsutsui : Generation of High Resolution Global DSM from ALOS PRISM, The International Archives of the Photogrammetry, Remote Sensing and Spatial Information Sciences, pp.243-248, Vol. XL-4, ISPRS TC IV Symposium, Suzhou, China, 2014. [http://www.int-arch-photogramm-remote-sens-spatial-inf-sci.net/XL-4/243/2014/isprsarchives-XL-4-243-2014.pdf]" + Environment.NewLine +
"T.Tadono, H.Ishida, F.Oda, S.Naito, K.Minakawa, H.Iwamoto : Precise Global DEM Generation By ALOS PRISM, ISPRS Annals of the Photogrammetry, Remote Sensing and Spatial Information Sciences, pp.71 - 76, Vol.II - 4, 2014. [http://www.isprs-ann-photogramm-remote-sens-spatial-inf-sci.net/II-4/71/2014/isprsannals-II-4-71-2014.pdf]" + Environment.NewLine +
"https://doi.org/10.5069/G94M92HB")
});
datasets.Add("ETOPO1", new DEMDataSet()
{
Expand Down
60 changes: 30 additions & 30 deletions DEM.Net.Core/Services/Imagery/ImageryProviders.Predefined.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,88 +13,88 @@ public partial class ImageryProvider
public static ImageryProvider MapBoxSatellite = new ImageryProvider()
{
Name = "MapBox-Satellite",
Attribution = new Attribution(ATTRIBUTION_SUBJECT, "© MapxBox - OpenStreetMap contributors", "https://www.mapbox.com"),
Attribution = new Attribution(ATTRIBUTION_SUBJECT, "MapBox Satellite", "https://www.mapbox.com", "© MapBox - OpenStreetMap contributors"),
UrlModel = new UrlModel("https://api.mapbox.com/v4/mapbox.satellite/{z}/{x}/{y}.png?access_token={t}", null),
TokenUserSecretsKey = "MapBoxToken",
MaxZoom = 23
};
public static ImageryProvider MapBoxSatelliteStreet = new ImageryProvider()
{
Name = "MapBox-SatelliteStreet",
Attribution = new Attribution(ATTRIBUTION_SUBJECT, "© MapxBox - OpenStreetMap contributors", "https://www.mapbox.com"),
Attribution = new Attribution(ATTRIBUTION_SUBJECT, "MapBox Satellite Street", "https://www.mapbox.com", "© MapBox - OpenStreetMap contributors"),
UrlModel = new UrlModel("https://api.mapbox.com/v4/mapbox.streets-satellite/{z}/{x}/{y}.png?access_token={t}", null),
TokenUserSecretsKey = "MapBoxToken",
MaxZoom = 23
};

public static ImageryProvider MapBoxStreets = new ImageryProvider()
{
Name = "MapBox-Streets",
Attribution = new Attribution(ATTRIBUTION_SUBJECT, "© MapxBox - OpenStreetMap contributors", "https://www.mapbox.com"),
Attribution = new Attribution(ATTRIBUTION_SUBJECT, "MapBox Streets", "https://www.mapbox.com", "© MapBox - OpenStreetMap contributors"),
TokenUserSecretsKey = "MapBoxToken",
UrlModel = new UrlModel("https://api.mapbox.com/styles/v1/xfischer/cjbtijn5qahc92qs2yghsy58p/tiles/256/{z}/{x}/{y}?access_token={t}", null),
MaxZoom = 23
};
};
public static ImageryProvider MapBoxOutdoors = new ImageryProvider()
{
Name = "MapBox-Outdoors",
Attribution = new Attribution(ATTRIBUTION_SUBJECT, "© MapxBox - OpenStreetMap contributors", "https://www.mapbox.com"),
Attribution = new Attribution(ATTRIBUTION_SUBJECT, "MapBox Outdoors", "https://www.mapbox.com", "© MapBox - OpenStreetMap contributors"),
TokenUserSecretsKey = "MapBoxToken",
UrlModel = new UrlModel("https://api.mapbox.com/styles/v1/xfischer/ck77w9wh11jp81ip2rj4kg7xq/tiles/256/{z}/{x}/{y}?access_token={t}", null),
MaxZoom = 23
};
public static ImageryProvider StamenTerrain = new ImageryProvider()
{
Name = "Stamen-Terrain",
Attribution = new Attribution(ATTRIBUTION_SUBJECT, "Map tiles by Stamen Design, under CC BY 3.0. Data by OpenStreetMap, under ODbL.", "Map tiles by <a href=\"http://stamen.com\">Stamen Design</a>, under <a href=\"http://creativecommons.org/licenses/by/3.0\">CC BY 3.0</a>. Data by <a href=\"http://openstreetmap.org\">OpenStreetMap</a>, under <a href=\"http://www.openstreetmap.org/copyright\">ODbL</a>."),
UrlModel = new UrlModel("http://{s}.tile.stamen.com/terrain/{z}/{x}/{y}.png", new[] { "a", "b", "c", "d" }),
MaxZoom = 14
};
public static ImageryProvider StamenToner = new ImageryProvider()
{
Name = "Stamen-Toner",
Attribution = new Attribution(ATTRIBUTION_SUBJECT, "Map tiles by Stamen Design, under CC BY 3.0. Data by OpenStreetMap, under ODbL.", "Map tiles by <a href=\"http://stamen.com\">Stamen Design</a>, under <a href=\"http://creativecommons.org/licenses/by/3.0\">CC BY 3.0</a>. Data by <a href=\"http://openstreetmap.org\">OpenStreetMap</a>, under <a href=\"http://www.openstreetmap.org/copyright\">ODbL</a>."),
Attribution = new Attribution(ATTRIBUTION_SUBJECT, "Stamen Toner", "https://stamen.com/", "Map tiles by <a href=\"http://stamen.com\">Stamen Design</a>, under <a href=\"http://creativecommons.org/licenses/by/3.0\">CC BY 3.0</a>. Data by <a href=\"http://openstreetmap.org\">OpenStreetMap</a>, under <a href=\"http://www.openstreetmap.org/copyright\">ODbL</a>."),
UrlModel = new UrlModel("http://{s}.tile.stamen.com/toner/{z}/{x}/{y}.png", new[] { "a", "b", "c", "d" }),
MaxZoom = 14
};
public static ImageryProvider StamenWaterColor = new ImageryProvider()
{
Name = "Stamen-Watercolor",
Attribution = new Attribution(ATTRIBUTION_SUBJECT, "Map tiles by Stamen Design, under CC BY 3.0. Data by OpenStreetMap, under CC BY SA.", "Map tiles by <a href=\"http://stamen.com\">Stamen Design</a>, under <a href=\"http://creativecommons.org/licenses/by/3.0\">CC BY 3.0</a>. Data by <a href=\"http://openstreetmap.org\">OpenStreetMap</a>, under <a href=\"http://creativecommons.org/licenses/by-sa/3.0\">CC BY SA</a>."),
Attribution = new Attribution(ATTRIBUTION_SUBJECT, "Stamen Watercolor", "https://stamen.com/", "Map tiles by <a href=\"http://stamen.com\">Stamen Design</a>, under <a href=\"http://creativecommons.org/licenses/by/3.0\">CC BY 3.0</a>. Data by <a href=\"http://openstreetmap.org\">OpenStreetMap</a>, under <a href=\"http://creativecommons.org/licenses/by-sa/3.0\">CC BY SA</a>."),
UrlModel = new UrlModel("http://{s}.tile.stamen.com/watercolor/{z}/{x}/{y}.jpg", new[] { "a", "b", "c", "d" }),
MaxZoom = 14
};
public static ImageryProvider OpenTopoMap = new ImageryProvider()
{
Name = "OpenTopoMap",
Attribution = new Attribution(ATTRIBUTION_SUBJECT, "Map data: OpenStreetMap and contributors, viewfinderpanoramas.org, SRTM. Map style: OpenTopoMap under CC-BY-SA.",
Attribution = new Attribution(ATTRIBUTION_SUBJECT, "OpenTopoMap",
"Map data: © <a href=\"https://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors, <a href=\"http://viewfinderpanoramas.org\"> SRTM</a> | Map style: &copy; <a href=\"https://opentopomap.org\" > OpenTopoMap</a> (<a href=\"https://creativecommons.org/licenses/by-sa/3.0/\" > CC-BY-SA</a>)"),
UrlModel = new UrlModel("https://{s}.tile.opentopomap.org/{z}/{x}/{y}.png", new[] { "a", "b", "c" }),
MaxZoom = 17
};
public static ImageryProvider EsriWorldImagery = new ImageryProvider()
{
Name = "Esri.WorldImagery",
Attribution = new Attribution(ATTRIBUTION_SUBJECT, "Source: Esri, DigitalGlobe, GeoEye, Earthstar Geographics, CNES/Airbus DS, USDA, USGS, AeroGRID, IGN, and the GIS User Community",
"https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer"),
Attribution = new Attribution(ATTRIBUTION_SUBJECT, "Esri World Imagery", "https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer", "Source: Esri, DigitalGlobe, GeoEye, Earthstar Geographics, CNES/Airbus DS, USDA, USGS, AeroGRID, IGN, and the GIS User Community"),
UrlModel = new UrlModel("https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}", null),
MaxZoom = 18
};
public static ImageryProvider MapTilerSatellite = new ImageryProvider()
public static ImageryProvider ThunderForestOutdoors = new ImageryProvider()
{
Name = "ThunderForest-Outdoors",
Attribution = new Attribution(ATTRIBUTION_SUBJECT, "ThunderForest", "https://www.thunderforest.com", "Maps © www.thunderforest.com, Data © www.osm.org/copyright"),
UrlModel = new UrlModel("https://tile.thunderforest.com/outdoors/{z}/{x}/{y}.png?apikey={t}", null),
TokenUserSecretsKey = "ThunderForestApiKey",
MaxZoom = 22
};
public static ImageryProvider ThunderForestLandscape = new ImageryProvider()
{
Name = "MapTiler-Satellite",
Attribution = new Attribution(ATTRIBUTION_SUBJECT, "© MapTiler - © OpenStreetMap contributors", "https://www.maptiler.com/copyright/"),
UrlModel = new UrlModel("https://api.maptiler.com/tiles/satellite/{z}/{x}/{y}.jpg?key={t}", null),
TokenUserSecretsKey = "MapTilerKey",
MaxZoom = 20
Name = "ThunderForest-Landscape",
Attribution = new Attribution(ATTRIBUTION_SUBJECT, "ThunderForest", "https://www.thunderforest.com", "Maps © www.thunderforest.com, Data © www.osm.org/copyright"),
UrlModel = new UrlModel("https://tile.thunderforest.com/landscape/{z}/{x}/{y}.png?apikey={t}", null),
TokenUserSecretsKey = "ThunderForestApiKey",
MaxZoom = 22
};
public static ImageryProvider MapTilerHillshades = new ImageryProvider()
public static ImageryProvider ThunderForestNeighbourhood = new ImageryProvider()
{
Name = "MapTiler-Hillshades",
Attribution = new Attribution(ATTRIBUTION_SUBJECT, "© MapTiler - © OpenStreetMap contributors", "https://www.maptiler.com/copyright/"),
UrlModel = new UrlModel("https://api.maptiler.com/tiles/hillshades/{z}/{x}/{y}.png?key={t}", null),
TokenUserSecretsKey = "MapTilerKey",
MaxZoom = 12
Name = "ThunderForest-Neighbourhood",
Attribution = new Attribution(ATTRIBUTION_SUBJECT, "ThunderForest", "https://www.thunderforest.com", "Maps © www.thunderforest.com, Data © www.osm.org/copyright"),
UrlModel = new UrlModel("https://tile.thunderforest.com/neighbourhood/{z}/{x}/{y}.png?apikey={t}", null),
TokenUserSecretsKey = "ThunderForestApiKey",
MaxZoom = 22
};

}
}

0 comments on commit d30f5af

Please sign in to comment.