Skip to content

Commit e28507a

Browse files
farfromrefugfarfromrefug
committed
chore: cleanup
# Conflicts: # src/index.ios.ts
1 parent c52ce64 commit e28507a

19 files changed

+9
-252
lines changed

‎src/geometry/index.android.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ export class PointGeometry extends Geometry<com.carto.geometry.PointGeometry, Po
2222
}
2323
export class LineGeometry extends Geometry<com.carto.geometry.LineGeometry, LineGeometryOptions> {
2424
createNative(options: LineGeometryOptions) {
25-
console.log('create native LineGeometry', options.poses, mapPosVectorFromArgs(options.poses));
2625
return new com.carto.geometry.LineGeometry(mapPosVectorFromArgs(options.poses));
2726
}
2827

‎src/geometry/reader.android.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ export class WKBGeometryReader extends BaseNative<com.carto.geometry.WKBGeometry
3737
return new com.carto.geometry.WKBGeometryReader();
3838
}
3939
readGeometry(value: number[] | ArrayBuffer | com.carto.core.BinaryData) {
40-
console.log('readGeometry', value instanceof com.carto.core.BinaryData);
4140
if (!(value instanceof com.carto.core.BinaryData)) {
4241
value = new com.carto.core.BinaryData(value as any);
4342
}

‎src/geometry/writer.android.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ export class WKBGeometryWriter extends BaseNative<com.carto.geometry.WKBGeometry
2828
}
2929
writeGeometry(value: Geometry<any, any>) {
3030
const geometry = value.getNative ? value.getNative() : value;
31-
console.log('writeGeometry', value, geometry);
3231
return this.getNative().writeGeometry(geometry);
3332
}
3433
}

‎src/index.android.ts‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ export { BaseNative, nativeProperty };
88
export function nativeColorProperty(target: any, k?, desc?: PropertyDescriptor): any;
99
export function nativeColorProperty(options: NativePropertyOptions): (target: any, k?, desc?: PropertyDescriptor) => any;
1010
export function nativeColorProperty(...args) {
11-
// const options = args[1] === undefined ? args[0] : undefined;
1211
return nativeProperty(
1312
{
1413
converter: {
@@ -33,16 +32,13 @@ export function nativeEnumProperty(...args) {
3332
return nativeProperty({}, ...args);
3433
}
3534
export function nativeAndroidEnumProperty(androidEnum, options: NativePropertyOptions): (target: any, k?, desc?: PropertyDescriptor) => any {
36-
// console.log('nativeAndroidEnumProperty', androidEnum, options);
3735
return nativeProperty(
3836
Object.assign(options || {}, {
3937
converter: {
4038
fromNative(value: typeof androidEnum) {
41-
// console.log('nativeAndroidEnumProperty', 'fromNative', value, value.swigValue());
4239
return value.swigValue();
4340
},
4441
toNative(value: any) {
45-
// console.log('nativeAndroidEnumProperty', 'fromNtoNativeative', value, androidEnum, androidEnum.swigToEnum(value));
4642
return androidEnum.swigToEnum(value);
4743
},
4844
},

‎src/index.common.ts‎

Lines changed: 6 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,36 @@
1+
/* eslint-disable no-redeclare */
12
import { Observable } from '@nativescript/core/data/observable';
23
import { ImageSource } from '@nativescript/core/image-source';
34
import { ImageAsset } from '@nativescript/core/image-asset';
45
import { RESOURCE_PREFIX, isDataURI, isFileOrResourcePath } from '@nativescript/core/utils/utils';
56
import { isAndroid } from '@nativescript/core/platform';
67

78
function createGetter(key: string, options: NativePropertyOptions) {
8-
// console.log('createGetter', key, options);
99
const nativeGetterName = ((isAndroid ? options.android : options.ios) || options).nativeGetterName || 'get' + key.charAt(0).toUpperCase() + key.slice(1);
1010
const converter = options.converter;
1111
return function () {
1212
let result;
13-
// console.log('getter', key, nativeGetterName);
1413
if (this.native && this.native[nativeGetterName]) {
1514
result = this.native[nativeGetterName]();
1615
} else {
1716
result = this.options[key] || options.defaultValue;
1817
}
1918
result = converter ? converter.fromNative.call(this, result, key) : result;
20-
// console.log('getter', key, options, nativeGetterName, !!getConverter, result);
2119
return result;
2220
};
2321
}
2422
function createSetter(key, options: NativePropertyOptions) {
2523
const nativeSetterName = ((isAndroid ? options.android : options.ios) || options).nativeSetterName || 'set' + key.charAt(0).toUpperCase() + key.slice(1);
2624
return function (newVal) {
27-
// console.log('setter', key, newVal, Array.isArray(newVal), typeof newVal, nativeSetterName, options.converter);
2825
this.options[key] = newVal;
2926
if (this.native && this.native[nativeSetterName]) {
3027
const actualVal = options.converter ? options.converter.toNative.call(this, newVal, key) : newVal;
3128
this.native[nativeSetterName](actualVal);
3229
this._buildStyle = null;
3330
}
34-
// this.notify({ object: this, eventName: Observable.propertyChangeEvent, propertyName: key, value: actualVal });
3531
};
3632
}
3733

38-
// function hasSetter(obj, prop) {
39-
// const descriptor = Object.getOwnPropertyDescriptor(obj, prop);
40-
// return descriptor && !!descriptor['set'];
41-
// }
4234
function nativePropertyGenerator(target: Object, key: string, options?: NativePropertyOptions) {
4335
Object.defineProperty(target, key, {
4436
get: createGetter(key, options),
@@ -115,75 +107,28 @@ export function _createImageSourceFromSrc(value: string | ImageSource | ImageAss
115107
if (typeof value === 'string' || value instanceof String) {
116108
value = value.trim();
117109

118-
const source = new ImageSource();
110+
let source: ImageSource;
119111
if (isDataURI(value)) {
120112
const base64Data = value.split(',')[1];
121113
if (base64Data !== undefined) {
122-
// if (sync) {
123-
source.loadFromBase64(base64Data);
124-
// return source;
125-
// imageLoaded();
126-
// } else {
127-
// return source.fromBase64(base64Data).then(() => source);
128-
// .then(imageLoaded);
129-
// }
114+
source = ImageSource.fromBase64Sync(base64Data);
130115
}
131116
} else if (isFileOrResourcePath(value)) {
132117
if (value.indexOf(RESOURCE_PREFIX) === 0) {
133118
const resPath = value.substr(RESOURCE_PREFIX.length);
134-
// if (sync) {
135-
source.loadFromResource(resPath);
136-
// return source.fromResource(resPath).then(() => source);
137-
// imageLoaded();
138-
// } else {
139-
// this.imageSource = null;
140-
// source.fromResource(resPath)
141-
// // .then(imageLoaded);
142-
// }
119+
source = ImageSource.fromResourceSync(resPath);
143120
} else {
144-
// if (sync) {
145-
source.loadFromFile(value);
146-
// return source.fromFile(value).then(() => source);
147-
// imageLoaded();
148-
// } else {
149-
// this.imageSource = null;
150-
// source.fromFile(value).then(imageLoaded);
151-
// }
121+
source = ImageSource.fromFileSync(value);
152122
}
153123
} else {
154-
// this.imageSource = null;
155-
// return fromUrl(value);
156-
// fromUrl(value);
157-
// .then(
158-
// r => {
159-
// if (this['_url'] === value) {
160-
// this.imageSource = r;
161-
// this.isLoading = false;
162-
// }
163-
// },
164-
// err => {
165-
// // catch: Response content may not be converted to an Image
166-
// this.isLoading = false;
167-
// if (traceEnabled()) {
168-
// if (typeof err === 'object' && err.message) {
169-
// err = err.message;
170-
// }
171-
// traceWrite(err, traceCategories.Debug);
172-
// }
173-
// }
174-
// );
175124
}
176125
return source;
177126
} else if (value instanceof ImageSource) {
178-
// Support binding the imageSource trough the src property
179-
// return Promise.resolve(value);
180127
return value;
181128
} else if (value instanceof ImageAsset) {
182-
// const result = await fromAsset(value);
183-
return null;
129+
return new ImageSource(value.nativeImage);
184130
} else {
185131
return new ImageSource(value);
186-
// return Promise.resolve(fromNativeSource(value));
187132
}
188133
}
189134
export function capitalize(s) {

‎src/index.ios.ts‎

Lines changed: 3 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,12 @@ export function nativeEnumProperty(...args) {
2929
{
3030
converter: {
3131
fromNative(value) {
32-
// return ABMultiValueCopyArrayOfAllValues;
3332
return value.ordinal();
3433
},
3534
toNative(value) {
3635
return value;
37-
// return enumType.values()[value];
38-
}
39-
}
36+
},
37+
},
4038
},
4139
...args
4240
);
@@ -80,42 +78,6 @@ export function nativeImageProperty(...args) {
8078
);
8179
}
8280

83-
// export function nativeColorProperty(target: Object, key: string | symbol) {
84-
// return nativeProperty(target, key, {
85-
// fromNative(value) {
86-
// return new Color(value.getARGB() as number).hex;
87-
// },
88-
// toNative(value) {
89-
// const theColor = typeof value === 'string' ? new Color(value) : value;
90-
// return NTColor.alloc().initWithRGBA(theColor.r, theColor.g, theColor.b, theColor.a);
91-
// }
92-
// });
93-
// }
94-
95-
// export function nativeCartoImageProperty(target: Object, key: string | symbol) {
96-
// return nativeProperty(target, key, {
97-
// fromNative(value, target) {
98-
// return target.options[key];
99-
// },
100-
// toNative(value) {
101-
// value = _createImageSourceFromSrc(value);
102-
// return NTBitmapUtils.createBitmapFromUIImage(value.ios as UIImage);
103-
// }
104-
// });
105-
// }
106-
107-
// export function nativeImageProperty(target: Object, key: string | symbol) {
108-
// return nativeProperty(target, key, {
109-
// fromNative(value, target) {
110-
// return target.options[key];
111-
// },
112-
// toNative(value) {
113-
// value = _createImageSourceFromSrc(value);
114-
// return (value.ios as UIImage);
115-
// }
116-
// });
117-
// }
118-
11981
export function mapPosVectorFromArgs(positions: MapPosVector | MapPos[] | NTMapPosVector, ignoreAltitude = true) {
12082
if (!positions) {
12183
return null;
@@ -126,15 +88,9 @@ export function mapPosVectorFromArgs(positions: MapPosVector | MapPos[] | NTMapP
12688
} else if (!(positions instanceof NTMapPosVector)) {
12789
const arrayPoses = positions as MapPos[];
12890
nativePoses = NTMapPosVector.alloc().init();
129-
// if (projection) {
130-
// arrayPoses.forEach(p => {
131-
// nativePoses.add(projection.getNative().fromWgs84(toNativeMapPos(p, ignoreAltitude)));
132-
// });
133-
// } else {
134-
arrayPoses.forEach(p => {
91+
arrayPoses.forEach((p) => {
13592
nativePoses.add(toNativeMapPos(p, ignoreAltitude));
13693
});
137-
// }
13894
}
13995
return nativePoses;
14096
}

‎src/layers/vector.ios.ts‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -242,27 +242,6 @@ class NTVectorEditEventListenerImpl extends NTVectorEditEventListener {
242242
return null;
243243
}
244244
}
245-
// @NativeClass
246-
// class NTVectorElementEventListenerImpl extends NTVectorElementEventListener {
247-
// private _owner: WeakRef<EditableVectorLayer>;
248-
249-
// public static initWithOwner(owner: WeakRef<EditableVectorLayer>): NTVectorElementEventListenerImpl {
250-
// const delegate = NTVectorElementEventListenerImpl.new() as NTVectorElementEventListenerImpl;
251-
// delegate._owner = owner;
252-
// return delegate;
253-
// }
254-
255-
// onVectorElementClicked(clickInfo: NTVectorElementClickInfo): boolean {
256-
// const owner = this._owner.get();
257-
// console.log('onVectorElementClicked', clickInfo, owner);
258-
// if (owner) {
259-
// owner.setSelectedVectorElement(clickInfo.getVectorElement());
260-
// }
261-
262-
// return true;
263-
// // return super.onVectorElementClicked(clickInfo);
264-
// }
265-
// }
266245
export class EditableVectorLayer extends BaseVectorLayer<NTEditableVectorLayer, VectorLayerOptions> {
267246
createNative(options: VectorLayerOptions) {
268247
if (!!options.dataSource) {

‎src/packagemanager/index.android.ts‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -228,12 +228,6 @@ export class CartoPackageManager extends DataSource<com.akylas.carto.additions.A
228228
return this.getNative().getServerPackagesCallback(new com.akylas.carto.additions.ServerPackagesCallback({ onServerPackages: callback as any }));
229229
}
230230
return this.getNative().getServerPackages();
231-
// console.log('getServerPackages', vector.size());
232-
// const result = [];
233-
// for (let index = 0; index < vector.size(); index++) {
234-
// result[index] = vector.get(index);
235-
// }
236-
// return result as PackageInfo[];
237231
}
238232
setPackagePriority(id: string, priority: number) {
239233
this.getNative().setPackagePriority(id, priority);
@@ -246,7 +240,6 @@ export class CartoPackageManager extends DataSource<com.akylas.carto.additions.A
246240
}
247241
suggestPackages(position: MapPos, projection: Projection) {
248242
const vector = this.getNative().suggestPackages(toNativeMapPos(position), projection.getNative());
249-
// console.log('getServerPackages', vector.size());
250243
const result = [];
251244
for (let index = 0; index < vector.size(); index++) {
252245
result[index] = vector.get(index);

‎src/packagemanager/index.ios.ts‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -153,23 +153,13 @@ export class CartoPackageManager extends DataSource<NTCartoPackageManager, Carto
153153
getLocalPackages() {
154154
const vector = this.getNative().getLocalPackages();
155155
return vector;
156-
// const result = [];
157-
// for (let index = 0; index < vector.size(); index++) {
158-
// result[index] = vector.get(index);
159-
// }
160-
// return result as PackageInfo[];
161156
}
162157
getServerPackage(packageId: string) {
163158
return this.getNative().getServerPackage(packageId);
164159
}
165160
getServerPackages() {
166161
const vector = this.getNative().getServerPackages();
167162
return vector;
168-
// const result = [];
169-
// for (let index = 0; index < vector.size(); index++) {
170-
// result[index] = vector.get(index);
171-
// }
172-
// return result as PackageInfo[];
173163
}
174164
setPackagePriority(id: string, priority: number) {
175165
this.getNative().setPackagePriorityPriority(id, priority);
@@ -183,7 +173,6 @@ export class CartoPackageManager extends DataSource<NTCartoPackageManager, Carto
183173
}
184174
suggestPackages(position: MapPos, projection: Projection) {
185175
const vector = this.getNative().suggestPackagesProjection(toNativeMapPos(position), projection.getNative());
186-
// console.log('getServerPackages', vector.size());
187176
const result = [];
188177
for (let index = 0; index < vector.size(); index++) {
189178
result[index] = vector.get(index);

‎src/ui/index.android.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,6 @@ export class CartoMap<T = DefaultLatLonKeys> extends CartoViewBase {
232232
const native: com.carto.layers.TileLayer = layer.getNative();
233233
if (!!native) {
234234
const layers = this.mapView.getLayers();
235-
// console.log('addLayer', index, layers.count(), native);
236235
if (index !== undefined && index < layers.count()) {
237236
layers.insert(index, native);
238237
} else {

0 commit comments

Comments
 (0)