Merge branch 'master' into wasm-example

fleaflet · Sep 12, 2024 · 5fb0e62 · 5fb0e62
2 parents 5b51677 + 93e51e7
commit 5fb0e62
Show file tree

Hide file tree

Showing 3 changed files with 103 additions and 30 deletions.
diff --git a/example/lib/pages/wms_tile_layer.dart b/example/lib/pages/wms_tile_layer.dart
@@ -22,7 +22,7 @@ class WMSLayerPage extends StatelessWidget {
  children: [
  TileLayer(
  wmsOptions: WMSTileLayerOptions(
- baseUrl: 'https://{s}.s2maps-tiles.eu/wms/?',
+ baseUrl: 'https://tiles.maps.eox.at/wms?',
  layers: const ['s2cloudless-2021_3857'],
  ),
  subdomains: const ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h'],
@@ -32,15 +32,90 @@ class WMSLayerPage extends StatelessWidget {
  popupInitialDisplayDuration: const Duration(seconds: 5),
  attributions: [
  TextSourceAttribution(
- 'Sentinel-2 cloudless - https://s2maps.eu by EOX IT Services GmbH',
- onTap: () => launchUrl(Uri.parse('https://s2maps.eu')),
+ 'Sentinel-2 provided by the European Commission (free, full '
+ 'and open access) [Sentinel-2 cloudless 2016, 2018, 2019, '
+ '2020, 2021, 2022 & 2023]',
+ onTap: () => launchUrl(Uri.parse(
+ 'https://sentinel.esa.int/documents/247904/690755/Sentinel_Data_Legal_Notice',
+ )),
+ prependCopyright: false,
+ ),
+ TextSourceAttribution(
+ 'OpenStreetMap © OpenStreetMap contributors [Terrain Light, '
+ 'Terrain, OpenStreetMap, Overlay]',
+ onTap: () => launchUrl(Uri.parse(
+ 'http://www.openstreetmap.org/copyright',
+ )),
+ prependCopyright: false,
+ ),
+ TextSourceAttribution(
+ 'NaturalEarth public domain [Terrain Light, Terrain, Overlay]',
+ onTap: () => launchUrl(Uri.parse(
+ 'http://www.naturalearthdata.com/about/terms-of-use/',
+ )),
+ prependCopyright: false,
+ ),
+ const TextSourceAttribution(
+ 'EUDEM © Produced using Copernicus data and information funded '
+ 'by the European Union [Terrain]',
+ prependCopyright: false,
+ ),
+ TextSourceAttribution(
+ 'ASTER GDEM is a product of METI and NASA [Terrain Light]',
+ onTap: () => launchUrl(Uri.parse(
+ 'https://lpdaac.usgs.gov/products/aster_policies',
+ )),
+ prependCopyright: false,
+ ),
+ TextSourceAttribution(
+ 'SRTM © NASA [Terrain]',
+ onTap: () => launchUrl(Uri.parse('http://www.nasa.gov/')),
+ prependCopyright: false,
+ ),
+ TextSourceAttribution(
+ 'GTOPO30 Data available from the U.S. Geological Survey '
+ '[Terrain Light, Terrain]',
+ onTap: () => launchUrl(Uri.parse(
+ 'https://lta.cr.usgs.gov/GTOPO30',
+ )),
+ prependCopyright: false,
  ),
  const TextSourceAttribution(
- 'Modified Copernicus Sentinel data 2021',
+ 'CleanTOPO2 public domain [Terrain]',
+ prependCopyright: false,
+ ),
+ TextSourceAttribution(
+ 'GEBCO © GEBCO [Terrain Light]',
+ onTap: () => launchUrl(Uri.parse('http://www.gebco.net/')),
+ prependCopyright: false,
+ ),
+ TextSourceAttribution(
+ 'GlobCover © ESA [Terrain]',
+ onTap: () => launchUrl(Uri.parse(
+ 'http://due.esrin.esa.int/page_globcover.php',
+ )),
+ prependCopyright: false,
+ ),
+ const TextSourceAttribution(
+ "Blue Marble © NASA's Earth Observatory [Blue Marble]",
+ prependCopyright: false,
+ ),
+ const TextSourceAttribution(
+ "Black Marble © NASA's Earth Observatory [Black Marble]",
+ prependCopyright: false,
+ ),
+ TextSourceAttribution(
+ 'Rendering: © EOX [Terrain Light, Terrain, OpenStreetMap, '
+ 'Overlay]',
+ onTap: () => launchUrl(Uri.parse('http://eox.at/')),
+ prependCopyright: false,
  ),
  TextSourceAttribution(
- 'Rendering: EOX::Maps',
- onTap: () => launchUrl(Uri.parse('https://maps.eox.at/')),
+ 'Rendering: © MapServer [OpenStreetMap, Overlay]',
+ onTap: () => launchUrl(Uri.parse(
+ 'https://github.com/mapserver/basemaps',
+ )),
+ prependCopyright: false,
  ),
  ],
  ),

diff --git a/example/web/manifest.json b/example/web/manifest.json
@@ -3,8 +3,8 @@
  "short_name": "flutter_map",
  "start_url": ".",
  "display": "standalone",
- "background_color": "#0175C2",
- "theme_color": "#0175C2",
+ "background_color": "#8EEA88",
+ "theme_color": "#8EEA88",
  "description": "A versatile mapping package for Flutter, based off leaflet.js, that's simple and easy to learn, yet completely customizable and configurable.",
  "orientation": "portrait-primary",
  "prefer_related_applications": false,

diff --git a/lib/src/layer/polygon_layer/painter.dart b/lib/src/layer/polygon_layer/painter.dart
@@ -64,32 +64,30 @@ base class _PolygonPainter<R extends Object>
  origin: hitTestCameraOrigin,
  points: projectedPolygon.points,
  );
-
  if (projectedCoords.first != projectedCoords.last) {
  projectedCoords.add(projectedCoords.first);
  }
- final isInPolygon = isPointInPolygon(point, projectedCoords);
-
- final hasHoles = projectedPolygon.holePoints.isNotEmpty;
- final isInHole = hasHoles &&
- () {
- for (final points in projectedPolygon.holePoints) {
- final projectedHoleCoords = getOffsetsXY(
- camera: camera,
- origin: hitTestCameraOrigin,
- points: points,
- );
-
- if (projectedHoleCoords.first != projectedHoleCoords.last) {
- projectedHoleCoords.add(projectedHoleCoords.first);
- }
 
- if (isPointInPolygon(point, projectedHoleCoords)) {
- return true;
- }
- }
- return false;
- }();
+ final isValidPolygon = projectedCoords.length >= 3;
+ final isInPolygon =
+ isValidPolygon && isPointInPolygon(point, projectedCoords);
+
+ final isInHole = projectedPolygon.holePoints.any(
+ (points) {
+ final projectedHoleCoords = getOffsetsXY(
+ camera: camera,
+ origin: hitTestCameraOrigin,
+ points: points,
+ );
+ if (projectedHoleCoords.first != projectedHoleCoords.last) {
+ projectedHoleCoords.add(projectedHoleCoords.first);
+ }
+
+ final isValidHolePolygon = projectedHoleCoords.length >= 3;
+ return isValidHolePolygon &&
+ isPointInPolygon(point, projectedHoleCoords);
+ },
+ );
 
  // Second check handles case where polygon outline intersects a hole,
  // ensuring that the hit matches with the visual representation