Skip to content
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

Replaces backslashes with forward slashes in KML files #8533

Merged
merged 11 commits into from
Jan 14, 2020
Merged

Replaces backslashes with forward slashes in KML files #8533

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ed19f5b
Replaces backslashes with forward slashes in KML files
Jan 13, 2020
f48ca09
Fixes eslint issue
Jan 13, 2020
9f45c90
Updates CHANGES.md
Jan 13, 2020
a3ac7a7
Adds explanation for change.
Jan 13, 2020
670cbbb
Adds test file
Jan 13, 2020
e78fafc
Updates test file compliant with KMZ spec
Jan 13, 2020
57efcf2
Merge branch 'master' into kmz-backslash-fix
sanjeetsuhag Jan 13, 2020
7fa8c0b
Improves test for resolution of Windows style paths in KMZ files
Jan 14, 2020
d8eb2ff
Merge branch 'kmz-backslash-fix' of https://github.com/AnalyticalGrap…
Jan 14, 2020
15e66df
Removes empty line in CHANGES.md
Jan 14, 2020
74d6bb9
Fixes import style
Jan 14, 2020
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
2 changes: 2 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,11 @@ Change Log

##### Fixes :wrench:
* Fixed a bug where the camera could go underground during mouse navigation. [#8504](https://github.com/AnalyticalGraphicsInc/cesium/pull/8504)
* Fixed a bug where files with backslashes were not loaded in KMZ files. [#8533](https://github.com/AnalyticalGraphicsInc/cesium/pull/8533)
* Reduced Cesium bundle size by avoiding unnecessarily importing `Cesium3DTileset` in `Picking.js` [#8532](https://github.com/AnalyticalGraphicsInc/cesium/pull/8532)
* Fixed WebGL warning message about `EXT_float_blend` being implicitly enabled. [#8534](https://github.com/AnalyticalGraphicsInc/cesium/pull/8534)


Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove empty line

### 1.65.0 - 2020-01-06

##### Breaking Changes :mega:
Expand Down
2 changes: 2 additions & 0 deletions Source/DataSources/KmlDataSource.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,6 +595,8 @@ import WallGraphics from './WallGraphics.js';

var resource;
if (defined(uriResolver)) {
// To resolve issues with KML sources defined in Windows style paths.
href = href.replace(/\\/g, '/');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's worth adding a short inline comment explaining why backslashes need to be converted here.

var blob = uriResolver[href];
if (defined(blob)) {
resource = new Resource({
Expand Down
Binary file added Specs/Data/KML/backslash.kmz
View file
Open in desktop
Binary file not shown.
8 changes: 8 additions & 0 deletions Specs/DataSources/KmlDataSourceSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,14 @@ describe('DataSources/KmlDataSource', function() {
});
});

it('load works with a KMZ URL with Windows-style paths', function() {
var dataSource = new KmlDataSource(options);
return dataSource.load('Data/KML/backslash.kmz').then(function(source) {
expect(source).toBe(dataSource);
expect(source.entities.values[0]._billboard._image._value).toBeDefined();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test also passes on master so it will need to be tweaked.

I noticed that source.entities.values[0]._billboard._image._value.url is a data uri if it successfully loads the image. You can use isDataUri to check that url is in fact a data uri.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This issue was resolved by using isDataUri. The test fails on master, but passes on this branch.

});
});

it('load works with a KMZ Resource', function() {
var dataSource = new KmlDataSource(options);
var resource = new Resource({
Expand Down