Skip to content

Remove unused sourceUri parameter from GeoJsonDataSource #12685

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove unused sourceUri parameter from GeoJsonDataSource #12685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CONTRIBUTORS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,3 +424,4 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu
- [Cody Butler](https://github.com/CodyBu)
- [Hiwen](https://github.com/Hiwen)
- [Matt Schwartz](https://github.com/mzschwartz5)
- [Khalisah Khan](https://github.com/khalisahkhan)
12 changes: 4 additions & 8 deletions packages/engine/Source/DataSources/GeoJsonDataSource.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import Frozen from "../Core/Frozen.js";
import defined from "../Core/defined.js";
import DeveloperError from "../Core/DeveloperError.js";
import Event from "../Core/Event.js";
import getFilenameFromUri from "../Core/getFilenameFromUri.js";
import PinBuilder from "../Core/PinBuilder.js";
import PolygonHierarchy from "../Core/PolygonHierarchy.js";
import Resource from "../Core/Resource.js";
Expand Down Expand Up @@ -554,7 +553,6 @@ function processTopology(dataSource, geoJson, geometry, crsFunction, options) {
*
* Initialization options for the <code>load</code> method.
*
* @property {string} [sourceUri] Overrides the url to use for resolving relative links.
* @property {GeoJsonDataSource.describe} [describe=GeoJsonDataSource.defaultDescribeProperty] A function which returns a Property object (or just a string).
* @property {number} [markerSize=GeoJsonDataSource.markerSize] The default size of the map pin created for each point, in pixels.
* @property {string} [markerSymbol=GeoJsonDataSource.markerSymbol] The default symbol of the map pin created for each point.
Expand Down Expand Up @@ -924,11 +922,9 @@ function preload(that, data, options, clear) {
that._credit = credit;

let promise = data;
let sourceUri = options.sourceUri;
if (typeof data === "string" || data instanceof Resource) {
data = Resource.createIfNeeded(data);
promise = data.fetchJson();
sourceUri = sourceUri ?? data.getUrlComponent();

// Add resource credits to our list of credits to display
const resourceCredits = that._resourceCredits;
Expand Down Expand Up @@ -960,7 +956,7 @@ function preload(that, data, options, clear) {

return Promise.resolve(promise)
.then(function (geoJson) {
return load(that, geoJson, options, sourceUri, clear);
return load(that, geoJson, options, clear);
})
.catch(function (error) {
DataSource.setLoading(that, false);
Expand All @@ -982,10 +978,10 @@ GeoJsonDataSource.prototype.update = function (time) {
return true;
};

function load(that, geoJson, options, sourceUri, clear) {
function load(that, geoJson, options, clear) {
let name;
if (defined(sourceUri)) {
name = getFilenameFromUri(sourceUri);
if (defined(geoJson.name)) {
name = geoJson.name;
}

if (defined(name) && that._name !== name) {
Expand Down